diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-photonicat.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-photonicat.dts index 93b1ec8753..0b0c3dce16 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-photonicat.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-photonicat.dts @@ -57,16 +57,26 @@ reset-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; }; - vcc_sysin: vcc-sysin-regulator { + vccin_5v: regulator-vccin-5v { compatible = "regulator-fixed"; - regulator-name = "vcc_sysin"; + regulator-name = "vccin_5v"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; }; - vcc_syson: vcc-syson-regulator { + vcc_sysin: regulator-vcc-sysin { + compatible = "regulator-fixed"; + regulator-name = "vcc_sysin"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vccin_5v>; + }; + + vcc_syson: regulator-vcc-syson { compatible = "regulator-fixed"; regulator-name = "vcc_syson"; regulator-always-on; @@ -76,7 +86,7 @@ vin-supply = <&vcc_sysin>; }; - vcc3v3_sys: vcc3v3-sys-regulator { + vcc3v3_sys: regulator-vcc3v3-sys { compatible = "regulator-fixed"; regulator-name = "vcc3v3_sys"; regulator-always-on; @@ -86,7 +96,7 @@ vin-supply = <&vcc_syson>; }; - vcc_1v8: vcc-1v8-regulator { + vcc_1v8: regulator-vcc-1v8 { compatible = "regulator-fixed"; regulator-name = "vcc_1v8"; regulator-always-on; @@ -96,7 +106,7 @@ vin-supply = <&vcc3v3_sys>; }; - vcc_3v3: vcc-3v3-regulator { + vcc_3v3: regulator-vcc-3v3 { compatible = "regulator-fixed"; regulator-name = "vcc_3v3"; regulator-always-on; @@ -106,17 +116,18 @@ vin-supply = <&vcc3v3_sys>; }; - vcc3v3_ngff: vcc3v3-ngff-regulator { + vcc3v3_ngff: regulator-vcc3v3-ngff { compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>; regulator-name = "vcc3v3_ngff"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + vin-supply = <&vccin_5v>; }; /* pi6c pcie clock generator */ - vcc3v3_pi6c: vcc3v3-pi6c-regulator { + vcc3v3_pi6c: regulator-vcc3v3-pi6c { compatible = "regulator-fixed"; enable-active-high; gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>; @@ -129,7 +140,7 @@ }; /* actually fed by vcc_syson, dependent on pi6c clock generator */ - vcc3v3_pcie: vcc3v3-pcie-regulator { + vcc3v3_pcie: regulator-vcc3v3-pcie { compatible = "regulator-fixed"; regulator-name = "vcc3v3_pcie"; regulator-always-on; @@ -139,7 +150,7 @@ vin-supply = <&vcc3v3_pi6c>; }; - vcc3v3_sd: vcc3v3-sd-regulator { + vcc3v3_sd: regulator-vcc3v3-sd { compatible = "regulator-fixed"; gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; @@ -151,7 +162,8 @@ vin-supply = <&vcc_3v3>; }; - vcc5v0_boost: vcc5v0-boost-regulator { + /* actually fed by vccin_5v, dependent on vcc5v0_usb_otg */ + vcc5v0_boost: regulator-vcc5v0-boost { compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; @@ -160,9 +172,10 @@ regulator-name = "vcc5v0_boost"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; + vin-supply = <&vcc5v0_usb_otg>; }; - vcc5v0_usb_otg: vcc5v0-usb-otg-regulator { + vcc5v0_usb_otg: regulator-vcc5v0-usb-otg { compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; @@ -171,10 +184,10 @@ regulator-name = "vcc5v0_usb_otg"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - vin-supply = <&vcc_sysin>; + vin-supply = <&vccin_5v>; }; - vcca_1v8: vcca-1v8-regulator { + vcca_1v8: regulator-vcca-1v8 { compatible = "regulator-fixed"; regulator-name = "vcca_1v8"; regulator-always-on; @@ -184,7 +197,7 @@ vin-supply = <&vcc3v3_sys>; }; - vdda_0v9: vdda-0v9-regulator { + vdda_0v9: regulator-vdda-0v9 { compatible = "regulator-fixed"; regulator-name = "vdda_0v9"; regulator-always-on; @@ -194,8 +207,8 @@ vin-supply = <&vcc3v3_sys>; }; - vdd_gpu: vdd-gpu-regulator { - compatible = "pwm-regulator"; + vdd_gpu: regulator-vdd-gpu { + compatible regulator-= "pwm"; pwms = <&pwm2 0 5000 1>; regulator-name = "vdd_gpu"; regulator-always-on; @@ -208,8 +221,8 @@ pwm-supply = <&vcc_syson>; }; - vdd_logic: vdd-logic-regulator { - compatible = "pwm-regulator"; + vdd_logic: regulator-vdd-logic { + compatible regulator-= "pwm"; pwms = <&pwm1 0 5000 1>; regulator-name = "vdd_logic"; regulator-always-on; @@ -561,7 +574,7 @@ }; &usb2phy0_otg { - phy-supply = <&vcc5v0_usb_otg>; + phy-supply = <&vcc5v0_boost>; status = "okay"; };