Unverified Commit 41001457 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.14-rockchip-dtsfixes1' of... 

Merge tag 'v6.14-rockchip-dtsfixes1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into HEAD

Fixes for the IOMMU used together with the PCIe controllers on rk3588,
some board-level fixes for wrong pins, pinctrl and regulators, and
disabling DMA on a board where the DMA+uart causes the dma controller to
hang, as well as improved network stability for the OrangePi R1.

* tag 'v6.14-rockchip-dtsfixes1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  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: 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

Link: https://lore.kernel.org/r/3004814.3ZeAukHxDK@diego


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a64dcfb4 8546cfd0

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:

  - |

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 {

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

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ / { 


&gmac2io {

	phy-handle = <&rtl8211e>;

	phy-mode = "rgmii";

	tx_delay = <0x24>;

	rx_delay = <0x18>;

	status = "okay";