diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi index 77e22615d1a8..a22d592e170f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi @@ -13,6 +13,17 @@ model = "Rockchip RK3566 EVB1 DDR4 V10 Board"; compatible = "rockchip,rk3566-evb1-ddr4-v10", "rockchip,rk3568"; + pcie20_3v3: gpio-regulator { + compatible = "regulator-gpio"; + regulator-name = "pcie20_3v3"; + regulator-min-microvolt = <0100000>; + regulator-max-microvolt = <3300000>; + gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; + gpios-states = <0x1>; + states = <0100000 0x0 + 3300000 0x1>; + }; + rk_headset: rk-headset { compatible = "rockchip_headset"; headset_gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_LOW>; @@ -29,6 +40,10 @@ status = "okay"; }; +&combphy2_psq { + status = "disabled"; +}; + &dig_acodec { status = "disabled"; #sound-dai-cells = <0>; @@ -167,6 +182,12 @@ status = "disabled"; }; +&pcie2x1 { + reset-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; + vpcie3v3-supply = <&pcie20_3v3>; + status = "disabled"; +}; + &pdm { status = "disabled"; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi index 21de12d2ce86..0b857ab3c6b6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi @@ -42,17 +42,6 @@ vin-supply = <&vcc3v3_sys>; }; - pcie20_3v3: gpio-regulator { - compatible = "regulator-gpio"; - regulator-name = "pcie20_3v3"; - regulator-min-microvolt = <0100000>; - regulator-max-microvolt = <3300000>; - gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; - gpios-states = <0x1>; - states = <0100000 0x0 - 3300000 0x1>; - }; - pcie30_avdd0v9: pcie30-avdd0v9 { compatible = "regulator-fixed"; regulator-name = "pcie30_avdd0v9"; @@ -95,10 +84,6 @@ }; }; -&combphy2_psq { - status = "okay"; -}; - /* * mipi_dphy0 needs to be enabled * when dsi0 is enabled @@ -215,12 +200,6 @@ status = "disabled"; }; -&pcie2x1 { - reset-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&pcie20_3v3>; - status = "okay"; -}; - &pcie30phy { status = "disabled"; };