Commit 23cb64fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-fixes-6.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull SoC fixes from Arnd Bergmann:
 "These are mainly devicetree fixes for the arm platforms from Rockchips
  NXP, ASpeed and Broadcom, addressing issues with accidental
  overclocking, pinctrl, network and dtc warnings.

  There are additional fixes for regressions with the i.MX reset and
  memory controller drivers as well as the Tegra memory controller
  driver.

  Minor updates to the MAINTAINERS file, tee documentation and
  defconfigs bring those up to date with recent changes elsewhere"

* tag 'soc-fixes-6.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (29 commits)
  MAINTAINERS: sync omap devicetree maintainers with omap platform
  MAINTAINERS: Update Krzysztof Kozlowski's email
  arm64: dts: rockchip: fix PCIe 3.3V regulator voltage on orangepi-5
  arm64: dts: rockchip: disable HS400 on RK3588 Tiger
  arm64: dts: rockchip: drop reset from rk3576 i2c9 node
  tee: <uapi/linux/tee.h: fix all kernel-doc issues
  arm64: dts: rockchip: Fix USB power enable pin for BTT CB2 and Pi2
  arm64: dts: broadcom: bcm2712: rpi-5: Add ethernet0 alias
  arm64: dts: broadcom: Assign clock rates in eth node for RPi5
  reset: imx8mp-audiomix: Fix bad mask values
  ARM: dts: BCM53573: Fix address of Luxul XAP-1440's Ethernet PHY
  arm64: defconfig: Fix V3D deferred probe timeout
  arm64: dts: rockchip: Fix vccio4-supply on rk3566-pinetab2
  arm64: dts: rockchip: include rk3399-base instead of rk3399 in rk3399-op1
  arm64: dts: imx8mp-kontron: Fix USB OTG role switching
  arm64: dts: imx95: Fix MSI mapping for PCIe endpoint nodes
  arm64: dts: imx8-ss-img: Avoid gpio0_mipi_csi GPIOs being deferred
  arm: imx_v6_v7_defconfig: enable ext4 directly
  memory: tegra210: Fix incorrect client ids
  arm64: dts: rockchip: Fix indentation on rk3399 haikou demo dtso
  ...
parents fdeee1cc 7a601324

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org> 
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>

Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>

Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@linaro.org>

Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com>

Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com>

Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org>

MAINTAINERS

+6 −2
Original line number Diff line number Diff line
@@ -16206,7 +16206,7 @@ MEMORY CONTROLLER DRIVERS 
M:	Krzysztof Kozlowski <krzk@kernel.org>

L:	linux-kernel@vger.kernel.org

S:	Maintained

B:	mailto:krzysztof.kozlowski@linaro.org

B:	mailto:krzk@kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git

F:	Documentation/devicetree/bindings/memory-controllers/

F:	drivers/memory/
@@ -18781,6 +18781,10 @@ S: Maintained 
F:	arch/arm/*omap*/*clock*









OMAP DEVICE TREE SUPPORT









M:	Aaro Koskinen <aaro.koskinen@iki.fi>









M:	Andreas Kemnade <andreas@kemnade.info>









M:	Kevin Hilman <khilman@baylibre.com>









M:	Roger Quadros <rogerq@kernel.org>









M:	Tony Lindgren <tony@atomide.com>









L:	linux-omap@vger.kernel.org









L:	devicetree@vger.kernel.org








@@ -21179,7 +21183,7 @@ F:	Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml







F:	drivers/i2c/busses/i2c-qcom-cci.c

















QUALCOMM INTERCONNECT BWMON DRIVER









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Krzysztof Kozlowski <krzk@kernel.org>









L:	linux-arm-msm@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml

























arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji-data64.dts



+14
−0






























Original line number
Diff line number
Diff line







@@ -1254,3 +1254,17 @@ &emmc {







	max-frequency = <25000000>;









	bus-width = <4>;









};



















/*









 * FIXME: rgmii delay is introduced by MAC (configured in u-boot now)









 * instead of PCB on fuji board, so the "phy-mode" should be updated to









 * "rgmii-[tx|rx]id" when the aspeed-mac driver can handle the delay









 * properly.









 */









&mac3 {









	status = "okay";









	phy-mode = "rgmii";









	phy-handle = <&ethphy3>;









	pinctrl-names = "default";









	pinctrl-0 = <&pinctrl_rgmii4_default>;









};
























arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dts



+2
−2






























Original line number
Diff line number
Diff line







@@ -55,8 +55,8 @@ &gmac0 {







	mdio {









		/delete-node/ switch@1e;



















		bcm54210e: ethernet-phy@0 {









			reg = <0>;









		bcm54210e: ethernet-phy@25 {









			reg = <25>;









		};









	};









};
































arch/arm/boot/dts/nxp/imx/imx51-zii-rdu1.dts



+2
−2






























Original line number
Diff line number
Diff line







@@ -259,7 +259,7 @@ &audmux {







	pinctrl-0 = <&pinctrl_audmux>;









	status = "okay";



















	ssi2 {









	mux-ssi2 {









		fsl,audmux-port = <1>;









		fsl,port-config = <









			(IMX_AUDMUX_V2_PTCR_SYN |








@@ -271,7 +271,7 @@ IMX_AUDMUX_V2_PDCR_RXDSEL(2)







		>;









	};



















	aud3 {









	mux-aud3 {









		fsl,audmux-port = <2>;









		fsl,port-config = <









			IMX_AUDMUX_V2_PTCR_SYN