diff --git a/rk3588/.dr4-rk3588.dtb.cmd b/rk3588/.dr4-rk3588.dtb.cmd index 707810f..3635f61 100644 --- a/rk3588/.dr4-rk3588.dtb.cmd +++ b/rk3588/.dr4-rk3588.dtb.cmd @@ -37,8 +37,6 @@ 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-gmac0.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac1.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-pcie-power-rk3588.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.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 84dedc8..2addab5 100644 --- a/rk3588/.dr4-rk3588.dtb.d.pre.tmp +++ b/rk3588/.dr4-rk3588.dtb.d.pre.tmp @@ -32,6 +32,4 @@ dr4-rk3588.o: arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts \ arch/arm64/boot/dts/rockchip/rk3588/rpdzkj_config.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-usb-host.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac0.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac1.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-pcie-power-rk3588.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.dtsi + arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac1.dtsi diff --git a/rk3588/.dr4-rk3588.dtb.dts.tmp b/rk3588/.dr4-rk3588.dtb.dts.tmp index 1bca97e..1a44c67 100644 --- a/rk3588/.dr4-rk3588.dtb.dts.tmp +++ b/rk3588/.dr4-rk3588.dtb.dts.tmp @@ -1,6 +1,6 @@ -# 1 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" -# 1 "" -# 1 "" +# 0 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" +# 0 "" +# 0 "" # 1 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" @@ -10674,7 +10674,7 @@ }; }; }; -# 6887 "arch/arm64/boot/dts/rockchip/rk3588/../rk3588s.dtsi" 2 +# 6888 "arch/arm64/boot/dts/rockchip/rk3588/../rk3588s.dtsi" 2 # 8 "arch/arm64/boot/dts/rockchip/rk3588/../rk3588.dtsi" 2 # 1 "arch/arm64/boot/dts/rockchip/rk3588/../rk3588-vccio3-pinctrl.dtsi" 1 @@ -14642,7 +14642,7 @@ phy-mode = "rgmii-rxid"; clock_in_out = "input"; - snps,reset-gpio = <&gpio2 20 1>; + snps,reset-gpio = <&gpio3 15 1>; snps,reset-active-low; snps,reset-delays-us = <0 20000 100000>; @@ -14678,7 +14678,7 @@ phy-mode = "rgmii-rxid"; clock_in_out = "input"; - snps,reset-gpio = <&gpio3 15 1>; + snps,reset-gpio = <&gpio2 20 1>; snps,reset-active-low; snps,reset-delays-us = <0 20000 100000>; @@ -14699,76 +14699,6 @@ status = "okay"; }; # 18 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 - - -# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-pcie-power-rk3588.dtsi" 1 - -/ { - pcie20_avdd0v85: pcie20-avdd0v85 { - compatible = "regulator-fixed"; - regulator-name = "pcie20_avdd0v85"; - regulator-boot-on; - regulator-always-on; - regulator-min-microvolt = <850000>; - regulator-max-microvolt = <850000>; - vin-supply = <&vdd_0v85_s0>; - }; - - pcie20_avdd1v8: pcie20-avdd1v8 { - compatible = "regulator-fixed"; - regulator-name = "pcie20_avdd1v8"; - regulator-boot-on; - regulator-always-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - vin-supply = <&avcc_1v8_s0>; - }; - - vcc3v3_pcie30: vcc3v3-pcie30 { - compatible = "regulator-fixed"; - regulator-name = "vcc3v3_pcie30"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - enable-active-high; - gpios = <&gpio4 5 0>; - startup-delay-us = <5000>; - vin-supply = <&vcc12v_dcin>; - }; - - -}; -# 21 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 -# 64 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" -# 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>; -}; -# 65 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 # 90 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" / { model = "dr4-rk3588"; diff --git a/rk3588/dr4-rk3588.dtb b/rk3588/dr4-rk3588.dtb index 7060718..55137bd 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 1aff368..ea6aa7c 100755 --- a/rk3588/dr4-rk3588.dts +++ b/rk3588/dr4-rk3588.dts @@ -17,7 +17,7 @@ #include "rp-eth-gmac1.dtsi" /* pcie */ -#include "rp-pcie-power-rk3588.dtsi" +// #include "rp-pcie-power-rk3588.dtsi" // #include "rp-pcie3.dtsi" //need comment when use board of make it youself,and remove the pcie function // #include "rp-pcie-5g.dtsi"