Commit ff202c50 authored Feb 21, 2025 by Linus Torvalds

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

Pull SoC fixes from Arnd Bergmann:
"Two people stepped up as platform co-maintainers: Andrew Jeffery for
ASpeed and Janne Grunau for Apple.

The rockchip platform gets 9 small fixes for devicetree files,
addressing both compile-time warnings and board specific bugs.

One bugfix for the optee firmware driver addresses a reboot-time hang.

Two drivers need improved Kconfig dependencies to allow wider compile-
testing while hiding the drivers on platforms that can't use them.

ARM SCMI and loongson-guts drivers get minor bugfixes"

* tag 'soc-fixes-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
soc: loongson: loongson2_guts: Add check for devm_kstrdup()
tee: optee: Fix supplicant wait loop
platform: cznic: CZNIC_PLATFORMS should depend on ARCH_MVEBU
firmware: imx: IMX_SCMI_MISC_DRV should depend on ARCH_MXC
MAINTAINERS: arm: apple: Add Janne as maintainer
MAINTAINERS: Mark Andrew as M: for ASPEED MACHINE SUPPORT
firmware: arm_scmi: imx: Correct tx size of scmi_imx_misc_ctrl_set
arm64: dts: rockchip: adjust SMMU interrupt type on rk3588
arm64: dts: rockchip: disable IOMMU when running rk3588 in PCIe endpoint mode
dt-bindings: rockchip: pmu: Ensure all properties are defined
arm64: defconfig: Enable TISCI Interrupt Router and Aggregator
arm64: dts: rockchip: Fix lcdpwr_en pin for Cool Pi GenBook
arm64: dts: rockchip: fix fixed-regulator renames on rk3399-gru devices
arm64: dts: rockchip: Disable DMA for uart5 on px30-ringneck
arm64: dts: rockchip: Move uart5 pin configuration to px30 ringneck SoM
arm64: dts: rockchip: change eth phy mode to rgmii-id for orangepi r1 plus lts
arm64: dts: rockchip: Fix broken tsadc pinctrl names for rk3588

parents 3ef7acec e31e3f6c

Documentation/devicetree/bindings/arm/rockchip/pmu.yaml

+7 −1

Original line number	Diff line number	Diff line
		@@ -53,11 +53,17 @@ properties:
		reg:
		maxItems: 1

		power-controller:
		type: object

		reboot-mode:
		type: object

		required:
		- compatible
		- reg

		additionalProperties: true
		additionalProperties: false

		examples:
		- \|

MAINTAINERS

+2 −1

Original line number	Diff line number	Diff line
		@@ -2210,6 +2210,7 @@ F: sound/soc/codecs/ssm3515.c

		ARM/APPLE MACHINE SUPPORT
		M: Sven Peter <sven@svenpeter.dev>
		M: Janne Grunau <j@jannau.net>
		R: Alyssa Rosenzweig <alyssa@rosenzweig.io>
		L: asahi@lists.linux.dev
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		@@ -2284,7 +2285,7 @@ F: drivers/irqchip/irq-aspeed-i2c-ic.c

		ARM/ASPEED MACHINE SUPPORT
		M: Joel Stanley <joel@jms.id.au>
		R: Andrew Jeffery <andrew@codeconstruct.com.au>
		M: Andrew Jeffery <andrew@codeconstruct.com.au>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		L: linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
		S: Supported

arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts

+0 −1

Original line number	Diff line number	Diff line
		@@ -226,7 +226,6 @@ &uart0 {
		};

		&uart5 {
		pinctrl-0 = <&uart5_xfer>;
		rts-gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
		status = "okay";
		};

arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi

+6 −0

Original line number	Diff line number	Diff line
		@@ -396,6 +396,12 @@ &u2phy_host {
		status = "okay";
		};

		&uart5 {
		/delete-property/ dmas;
		/delete-property/ dma-names;
		pinctrl-0 = <&uart5_xfer>;
		};

		/* Mule UCAN */
		&usb_host0_ehci {
		status = "okay";

arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts

+1 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,7 @@ / {

		&gmac2io {
		phy-handle = <&yt8531c>;
		tx_delay = <0x19>;
		rx_delay = <0x05>;
		phy-mode = "rgmii-id";
		status = "okay";

		mdio {