From 6009fbfc7f699e3302275a73a0e273d7c0102b9c Mon Sep 17 00:00:00 2001 From: hejiawencc Date: Thu, 29 Jun 2023 17:55:07 +0800 Subject: [PATCH] =?UTF-8?q?dts=20=E4=BF=AE=E5=A4=8D=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=92=8C=E9=85=8D=E7=BD=AE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...566-lubancat-0-spi3-m1-gpio-cs-overlay.dts | 1 - ...-2io-dsi0-in-vp0-10.1-800x1280-overlay.dts | 56 +++++++++---------- ...t-2io-dsi0-in-vp0-7.0-1024x600-overlay.dts | 46 +++++++-------- ...rk3568-lubancat-2io-edp-in-vp1-overlay.dts | 2 +- .../dts/rockchip/rk3568-lubancat-2io-edp.dtsi | 2 +- 5 files changed, 53 insertions(+), 54 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk3566-lubancat-0-spi3-m1-gpio-cs-overlay.dts b/arch/arm64/boot/dts/rockchip/overlay/rk3566-lubancat-0-spi3-m1-gpio-cs-overlay.dts index b67d253ef84d..0eb0485c37e1 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk3566-lubancat-0-spi3-m1-gpio-cs-overlay.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk3566-lubancat-0-spi3-m1-gpio-cs-overlay.dts @@ -5,7 +5,6 @@ #include / { - compatible = "rockchip,rk3568"; fragment@0 { target = <&spi3>; diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-2io-dsi0-in-vp0-10.1-800x1280-overlay.dts b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-2io-dsi0-in-vp0-10.1-800x1280-overlay.dts index 528d1e3c187e..c54be972d4d6 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-2io-dsi0-in-vp0-10.1-800x1280-overlay.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-2io-dsi0-in-vp0-10.1-800x1280-overlay.dts @@ -9,16 +9,16 @@ / { fragment@0 { - target = <&route_dsi1>; + target = <&route_dis0>; __overlay__ { status = "okay"; - connect = <&vp1_out_dsi1>; + connect = <&vp0_out_dis0>; }; }; fragment@1 { - target = <&video_phy1>; + target = <&video_phy0>; __overlay__ { status = "okay"; @@ -26,36 +26,36 @@ }; fragment@2 { - target = <&dsi1_in_vp0>; + target = <&dis0_in_vp0>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@3 { + target = <&dis0_in_vp1>; __overlay__ { status = "disabled"; }; }; - fragment@3 { - target = <&dsi1_in_vp1>; - - __overlay__ { - status = "okay"; - }; - }; - fragment@4 { - target = <&dsi1>; + target = <&dis0>; __overlay__ { status = "okay"; - power-supply = <&mipi_dsi1_power>; + power-supply = <&mipi_dis0_power>; #address-cells = <1>; #size-cells = <0>; - dsi1_panel: panel@0 { + dis0_panel: panel@0 { status = "okay"; compatible = "simple-panel-dsi"; reg = <0>; - backlight = <&backlight1>; - reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>; + backlight = <&backlight0>; + reset-gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_LOW>; enable-delay-ms = <35>; prepare-delay-ms = <6>; @@ -272,8 +272,8 @@ ]; disp_timings: display-timings { - native-mode = <&dsi1_timing>; - dsi1_timing: timing { + native-mode = <&dis0_timing>; + dis0_timing: timing { clock-frequency = <67000000>; hactive = <800>; vactive = <1280>; @@ -295,8 +295,8 @@ #size-cells = <0>; port@0 { reg = <0>; - panel_in_dsi1: endpoint { - remote-endpoint = <&dsi1_out_panel>; + panel_in_dis0: endpoint { + remote-endpoint = <&dis0_out_panel>; }; }; }; @@ -308,8 +308,8 @@ port@1 { reg = <1>; - dsi1_out_panel: endpoint { - remote-endpoint = <&panel_in_dsi1>; + dis0_out_panel: endpoint { + remote-endpoint = <&panel_in_dis0>; }; }; }; @@ -317,7 +317,7 @@ }; fragment@5 { - target = <&i2c5>; + target = <&i2c1>; __overlay__ { status = "okay"; @@ -329,10 +329,10 @@ status = "okay"; compatible = "goodix,gt928"; reg = <0x5d>; - interrupt-parent = <&gpio3>; - interrupts = ; - reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_LOW>; - irq-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; + interrupt-parent = <&gpio0>; + interrupts = ; + reset-gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; + irq-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; touchscreen-inverted-y; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-2io-dsi0-in-vp0-7.0-1024x600-overlay.dts b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-2io-dsi0-in-vp0-7.0-1024x600-overlay.dts index dd274feaa435..91c9fbd9a56a 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-2io-dsi0-in-vp0-7.0-1024x600-overlay.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-2io-dsi0-in-vp0-7.0-1024x600-overlay.dts @@ -9,16 +9,16 @@ / { fragment@0 { - target = <&route_dsi1>; + target = <&route_dsi0>; __overlay__ { status = "okay"; - connect = <&vp1_out_dsi1>; + connect = <&vp0_out_dsi0>; }; }; fragment@1 { - target = <&video_phy1>; + target = <&video_phy0>; __overlay__ { status = "okay"; @@ -26,35 +26,35 @@ }; fragment@2 { - target = <&dsi1_in_vp0>; + target = <&dis0_in_vp0>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@3 { + target = <&dis0_in_vp1>; __overlay__ { status = "disabled"; }; }; - fragment@3 { - target = <&dsi1_in_vp1>; - - __overlay__ { - status = "okay"; - }; - }; - fragment@4 { - target = <&dsi1>; + target = <&dis0>; __overlay__ { status = "okay"; - power-supply = <&mipi_dsi1_power>; + power-supply = <&mipi_dis0_power>; #address-cells = <1>; #size-cells = <0>; - dsi1_panel: panel@0 { + dis0_panel: panel@0 { status = "okay"; compatible = "simple-panel-dsi"; reg = <0>; - backlight = <&backlight1>; + backlight = <&backlight0>; reset-gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_LOW>; enable-delay-ms = <35>; @@ -87,8 +87,8 @@ ]; disp_timings: display-timings { - native-mode = <&dsi1_timing>; - dsi1_timing: timing { + native-mode = <&dis0_timing>; + dis0_timing: timing { clock-frequency = <51669000>; hactive = <1024>; vactive = <600>; @@ -110,8 +110,8 @@ #size-cells = <0>; port@0 { reg = <0>; - panel_in_dsi1: endpoint { - remote-endpoint = <&dsi1_out_panel>; + panel_in_dis0: endpoint { + remote-endpoint = <&dis0_out_panel>; }; }; }; @@ -123,8 +123,8 @@ port@1 { reg = <1>; - dsi1_out_panel: endpoint { - remote-endpoint = <&panel_in_dsi1>; + dis0_out_panel: endpoint { + remote-endpoint = <&panel_in_dis0>; }; }; }; @@ -132,7 +132,7 @@ }; fragment@5 { - target = <&i2c5>; + target = <&i2c1>; __overlay__ { status = "okay"; diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-2io-edp-in-vp1-overlay.dts b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-2io-edp-in-vp1-overlay.dts index eb0ab5ba4137..5affa52c786e 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-2io-edp-in-vp1-overlay.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-2io-edp-in-vp1-overlay.dts @@ -46,7 +46,7 @@ __overlay__ { status = "okay"; - // hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>; //热插拔信号检测 + // hpd-gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>; //热插拔信号检测 force-hpd; //强制hpd，忽略物理hdp信号 ports { diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2io-edp.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2io-edp.dtsi index 3eefb3bca19c..c900c7366bf4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2io-edp.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2io-edp.dtsi @@ -47,7 +47,7 @@ &edp { status = "okay"; - // hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>; //热插拔信号检测 + // hpd-gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>; //热插拔信号检测 force-hpd; //强制hpd，忽略物理hdp信号 ports {