diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk3566-lubancat-1io-edp-in-vp0-overlay.dts b/arch/arm64/boot/dts/rockchip/overlay/rk3566-lubancat-1io-edp-in-vp0-overlay.dts index b9038e46595a..70e34006ca98 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk3566-lubancat-1io-edp-in-vp0-overlay.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk3566-lubancat-1io-edp-in-vp0-overlay.dts @@ -71,7 +71,7 @@ compatible = "simple-panel"; backlight = <&backlight2>; status = "okay"; - power-supply = <&vdd_3v3_edp_lcd>; + power-supply = <&vcc_edp_lcd>; enable-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //bus-format = ; prepare-delay-ms = <100>; //AUX通信前延时 diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk3566-lubancat-1io-edp-touch-overlay.dts b/arch/arm64/boot/dts/rockchip/overlay/rk3566-lubancat-1io-edp-touch-overlay.dts index 4d88d3e3247d..a0d84b78c40a 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk3566-lubancat-1io-edp-touch-overlay.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk3566-lubancat-1io-edp-touch-overlay.dts @@ -7,7 +7,6 @@ / { - fragment@0 { target = <&i2c4>; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1io.dts b/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1io.dts index f3745b7b112c..b8218612793c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1io.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1io.dts @@ -14,7 +14,9 @@ #include #include #include "rk3566.dtsi" -#include "rk3566-lubancat-hdmi.dtsi" //HDMI输出 + +//HDMI输出 +#include "rk3566-lubancat-hdmi.dtsi" / { model = "EmbedFire LubanCat-1IO"; @@ -161,16 +163,6 @@ regulator-name = "vcc5v0_otg"; }; - vdd_3v3_edp_tp: vdd-3v3-edp-tp-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&edp_tp_pwr_en>; - regulator-name = "vdd_3v3_edp_tp"; - regulator-always-on; - }; - pcie2_3v3: pcie2-3v3-regulator { compatible = "regulator-fixed"; enable-active-high; @@ -240,18 +232,16 @@ regulator-always-on; }; - - vdd_3v3_edp_lcd: vdd-3v3-edp-lcd-regulator { + vcc_edp_lcd: vcc-edp-lcd-regulator { compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; - pinctrl-0 = <&edp_lcd_pwr_en>; - regulator-name = "vdd_3v3_edp_lcd"; + pinctrl-0 = <&edp_pwr_en>; + regulator-name = "vdd_edp_lcd"; regulator-always-on; }; - rk809_sound: rk809-sound { status = "okay"; compatible = "simple-audio-card"; @@ -1132,7 +1122,7 @@ }; lcd { - edp_lcd_pwr_en: edp-lcd-pwr-en { + edp_pwr_en: edp-pwr-en { rockchip,pins = <1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; @@ -1160,10 +1150,6 @@ }; power{ - edp_tp_pwr_en: edp-tp-pwr-en { - rockchip,pins = <1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; - }; - vcc3v3_output_en: vcc3v3-output-en { rockchip,pins = <3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>; }; @@ -1175,7 +1161,6 @@ vcc12v0_output_en: vcc12v0-output-en { rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>; }; - }; usb {