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 c3c9827..2426283 100644 Binary files a/rk3588/dr4-rk3588.dtb and b/rk3588/dr4-rk3588.dtb differ 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"; };