diff --git a/arch/arm64/boot/dts/rockchip/rk3568-dshapi-r1.dts b/arch/arm64/boot/dts/rockchip/rk3568-dshapi-r1.dts index 2c05b251176f..f6fd8ec82853 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-dshapi-r1.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-dshapi-r1.dts @@ -128,8 +128,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; enable-active-high; - //gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; - gpio = <&gpio2 RK_PD7 GPIO_ACTIVE_LOW>; + gpio = <&gpio2 RK_PD7 GPIO_ACTIVE_HIGH>; startup-delay-us = <5000>; vin-supply = <&dc_12v>; }; @@ -434,14 +433,15 @@ status = "okay"; }; - pcie20_3v3: gpio-regulator { - compatible = "regulator-gpio"; - regulator-name = "pcie20_3v3"; - regulator-min-microvolt = <100000>; + vcc3v3_pcie20: gpio-regulator-pcie20 { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3_pcie20"; + regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpios = <&gpio3 RK_PC2 GPIO_ACTIVE_HIGH>; - gpios-states = <0x1>; - states = <100000 0x0 3300000 0x1>; + enable-active-high; + gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_HIGH>; + startup-delay-us = <5000>; + vin-supply = <&dc_12v>; }; leds: leds { @@ -1307,24 +1307,20 @@ status = "okay"; }; -/*pcie2.0 wip*/ - &pcie2x1 { reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&pcie20_3v3>; - pinctrl-0 = <&pcie20m1_pins>; - status = "disabled"; + vpcie3v3-supply = <&vcc3v3_pcie20>; + status = "okay"; }; &pcie30phy { - status = "disabled"; + status = "okay"; }; &pcie3x2 { reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>; vpcie3v3-supply = <&vcc3v3_pcie>; - pinctrl-0 = <&pcie30x2m1_pins>; - status = "disabled"; + status = "okay"; }; &pwm15 {