From 8d68461a3e1f45df0d9d38cfa4a463ae60e86765 Mon Sep 17 00:00:00 2001 From: zhangpeng Date: Mon, 26 May 2025 14:41:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E7=A1=AC=E4=BB=B6=E2=80=94?= =?UTF-8?q?=E2=80=94=E6=9C=80=E7=BB=88=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rk3588/.dr4-rk3588.dtb.cmd | 4 ++ rk3588/.dr4-rk3588.dtb.d.pre.tmp | 6 ++- rk3588/.dr4-rk3588.dtb.dts.tmp | 88 +++++++++++++++++++++++++++++-- rk3588/dr4-rk3588.dtb | Bin 265706 -> 265626 bytes rk3588/dr4-rk3588.dts | 14 +++-- 5 files changed, 104 insertions(+), 8 deletions(-) diff --git a/rk3588/.dr4-rk3588.dtb.cmd b/rk3588/.dr4-rk3588.dtb.cmd index dd8ccfc..ea26eb6 100644 --- a/rk3588/.dr4-rk3588.dtb.cmd +++ b/rk3588/.dr4-rk3588.dtb.cmd @@ -37,6 +37,10 @@ deps_arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dtb := \ arch/arm64/boot/dts/rockchip/rk3588/rp-usb-host.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac1.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-hdmirx.dtsi \ + arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi \ + arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi0.dtsi \ + arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.dtsi \ + arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-typec-dp0.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dtb: $(deps_arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dtb) diff --git a/rk3588/.dr4-rk3588.dtb.d.pre.tmp b/rk3588/.dr4-rk3588.dtb.d.pre.tmp index f1299b9..929c117 100644 --- a/rk3588/.dr4-rk3588.dtb.d.pre.tmp +++ b/rk3588/.dr4-rk3588.dtb.d.pre.tmp @@ -32,4 +32,8 @@ dr4-rk3588.o: arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts \ arch/arm64/boot/dts/rockchip/rk3588/rp-usb-typec-rk3588.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-usb-host.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac1.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-hdmirx.dtsi + arch/arm64/boot/dts/rockchip/rk3588/rp-hdmirx.dtsi \ + arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi \ + arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi0.dtsi \ + arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.dtsi \ + arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-typec-dp0.dtsi diff --git a/rk3588/.dr4-rk3588.dtb.dts.tmp b/rk3588/.dr4-rk3588.dtb.dts.tmp index c739597..fe864e5 100644 --- a/rk3588/.dr4-rk3588.dtb.dts.tmp +++ b/rk3588/.dr4-rk3588.dtb.dts.tmp @@ -14827,6 +14827,82 @@ pinctrl-names = "default"; }; # 31 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 +# 65 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" +# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" 1 +# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi0.dtsi" 1 +&hdmi0 { + status = "okay"; +}; + +&hdmi0_in_vp0 { + status = "okay"; +}; + +&hdmi0_sound { + status = "okay"; +}; + +&i2s5_8ch { + status = "okay"; +}; + +&hdptxphy_hdmi0 { + status = "okay"; +}; + +&route_hdmi0 { + status = "okay"; + connect = <&vp0_out_hdmi0>; +}; +# 2 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" 2 +# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.dtsi" 1 +&hdmi1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&hdmim2_tx1_cec &hdmim0_tx1_hpd &hdmim2_tx1_scl &hdmim2_tx1_sda>; +}; + +&hdmi1_in_vp1 { + status = "okay"; +}; + +&hdmi1_sound { + status = "okay"; +}; + +&i2s6_8ch { + status = "okay"; +}; + + +&hdptxphy_hdmi1 { + status = "okay"; +}; + + +&route_hdmi1 { + status = "okay"; + connect = <&vp1_out_hdmi1>; +}; +# 3 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" 2 +# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-typec-dp0.dtsi" 1 +&dp0 { + status = "okay"; +}; + +&dp0_in_vp2 { + status = "okay"; +}; + +&dp0_sound{ + status = "okay"; +}; + +&spdif_tx2 { + status = "okay"; +}; +# 4 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" 2 +# 66 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 # 89 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" / { model = "dr4-rk3588"; @@ -14910,6 +14986,12 @@ pinctrl-0 = <&uart4m2_xfer>; }; +&uart7 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&uart7m2_xfer>; +}; + &can0 { @@ -14950,7 +15032,7 @@ &sdmmc { - status = "disabled"; + status = "okay"; }; &fiq_debugger { @@ -14963,9 +15045,9 @@ clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll"; }; &hdptxphy_hdmi_clk0 { - status = "disabled"; + status = "okay"; }; &hdptxphy_hdmi_clk1 { - status = "disabled"; + status = "okay"; }; diff --git a/rk3588/dr4-rk3588.dtb b/rk3588/dr4-rk3588.dtb index c3c9827e43301dd1a4714b2b5db566f34611317a..242628330742e5de1a5523636ea5f985a927accd 100644 GIT binary patch delta 361 zcmXAlKS%;`6vywqGYCvOLU8CBEJ>Rx?e2tzqLyeVh$by;C@X!DGIhwNk$(P4Qf!(2ObJ2xJf|?o2jgz zL}>}_ObB4-9Ia{k)`*6FDr$PXt)T>MbgAJ4$r=i*J&oTTX3zdBj9E>5C}WdZl)uG6 am+>14ec(YItW_O;E*$Yf6f^?u_XG delta 389 zcmY+9ze@rE6vyv9g#zDUF0>k2?G3fJk9IS-|mid*byl! zp@Zr%?4Y=S5xSR|3IWYWS>*0=0_hq=bq?;Gw*V)08!kR#WlQZw_wVp=>iFJ!042;?fh2 j_{i~rZsOn2L(x~1|DV0oe8pK~P1^|PsDTsV diff --git a/rk3588/dr4-rk3588.dts b/rk3588/dr4-rk3588.dts index 07d42b8..4176c21 100755 --- a/rk3588/dr4-rk3588.dts +++ b/rk3588/dr4-rk3588.dts @@ -62,7 +62,7 @@ //#include "rp-lcd-hdmi0.dtsi" //batch ignore //#include "rp-lcd-hdmi1.dtsi" //batch ignore //#include "rp-lcd-typec-dp0.dtsi" //usb edp0, must be enable rp-usb-typec.dtsi, batch ignore -// #include "rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" +#include "rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" /* lcd */ // #include "rp-lcd-mipi0-5-720-1280-v2-boxTP.dtsi" @@ -179,6 +179,12 @@ pinctrl-0 = <&uart4m2_xfer>; }; +&uart7 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&uart7m2_xfer>; +}; + &can0 { @@ -219,7 +225,7 @@ &sdmmc { - status = "disabled"; + status = "okay"; }; &fiq_debugger { @@ -232,9 +238,9 @@ clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll"; }; &hdptxphy_hdmi_clk0 { - status = "disabled"; + status = "okay"; }; &hdptxphy_hdmi_clk1 { - status = "disabled"; + status = "okay"; };