From e81fbbdddee567abeb10d1b2940e6c27c5bd39fd Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Tue, 20 Jul 2021 09:09:35 +0800 Subject: [PATCH] arm64: dts: rockchip: rk356x-evb: fix pcie supply to regulator-fixed Commit 6de4caa7df ("arm64: dts: rockchip: rk356x-evb: fix pcie supply to regulator-fixed") cleanup these stuff but we still have some left. Signed-off-by: Shawn Lin Change-Id: I29ebb92cc3dd0eaccfa610c7d526e46a0c33f320 --- .../boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi | 15 +++++++-------- .../boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi | 14 ++++++-------- .../boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi | 16 +++++++--------- 3 files changed, 20 insertions(+), 25 deletions(-) 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 dc847d0ab9ed..ead78e0077a2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi @@ -62,15 +62,14 @@ vin-supply = <&vcc3v3_sys>; }; - pcie30_3v3: gpio-regulator { - compatible = "regulator-gpio"; - regulator-name = "pcie30_3v3"; - regulator-min-microvolt = <100000>; + vcc3v3_pcie: gpio-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3_pcie"; + regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + enable-active-high; gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; - gpios-states = <0x1>; - states = <100000 0x0 - 3300000 0x1>; + vin-supply = <&dc_12v>; }; vcc3v3_bu: vcc3v3-bu { @@ -368,7 +367,7 @@ &pcie3x2 { reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&pcie30_3v3>; + vpcie3v3-supply = <&vcc3v3_pcie>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi index 1385dbd0c6d4..1df326259635 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi @@ -52,15 +52,13 @@ vin-supply = <&vcc3v3_sys>; }; - pcie30_3v3: gpio-regulator { - compatible = "regulator-gpio"; - regulator-name = "pcie30_3v3"; - regulator-min-microvolt = <100000>; + vcc3v3_pcie: gpio-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3_pcie"; + regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; - gpios-states = <0x1>; - states = <100000 0x0 - 3300000 0x1>; + vin-supply = <&dc_12v>; }; vcc3v3_bu: vcc3v3-bu { @@ -389,7 +387,7 @@ &pcie3x2 { reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&pcie30_3v3>; + vpcie3v3-supply = <&vcc3v3_pcie>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi index 238a4823b004..e711e0fd960a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi @@ -54,15 +54,13 @@ vin-supply = <&vcc3v3_sys>; }; - pcie30_3v3: gpio-regulator { - compatible = "regulator-gpio"; - regulator-name = "pcie30_3v3"; - regulator-min-microvolt = <100000>; + vcc3v3_pcie: gpio-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3_pcie"; + regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; - gpios-states = <0x1>; - states = <100000 0x0 - 3300000 0x1>; + vin-supply = <&dc_12v>; }; pcie30_avdd0v9: pcie30-avdd0v9 { @@ -276,13 +274,13 @@ &pcie3x1 { reset-gpios = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&pcie30_3v3>; + vpcie3v3-supply = <&vcc3v3_pcie>; status = "okay"; }; &pcie3x2 { reset-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&pcie30_3v3>; + vpcie3v3-supply = <&vcc3v3_pcie>; status = "okay"; };