diff --git a/rk3588/.dr4-rk3588.dtb.cmd b/rk3588/.dr4-rk3588.dtb.cmd index badcc2e..a14dccd 100644 --- a/rk3588/.dr4-rk3588.dtb.cmd +++ b/rk3588/.dr4-rk3588.dtb.cmd @@ -32,7 +32,6 @@ deps_arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dtb := \ scripts/dtc/include-prefixes/dt-bindings/sensor-dev.h \ arch/arm64/boot/dts/rockchip/rk3588/../rk3588-rk806-single.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/../rk3588-linux.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-tp-i2c6-gt911.dtsi \ 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 \ diff --git a/rk3588/.dr4-rk3588.dtb.d.pre.tmp b/rk3588/.dr4-rk3588.dtb.d.pre.tmp index c213b26..43c2305 100644 --- a/rk3588/.dr4-rk3588.dtb.d.pre.tmp +++ b/rk3588/.dr4-rk3588.dtb.d.pre.tmp @@ -28,7 +28,6 @@ dr4-rk3588.o: arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts \ scripts/dtc/include-prefixes/dt-bindings/sensor-dev.h \ arch/arm64/boot/dts/rockchip/rk3588/../rk3588-rk806-single.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/../rk3588-linux.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-tp-i2c6-gt911.dtsi \ 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 \ diff --git a/rk3588/.dr4-rk3588.dtb.dts.tmp b/rk3588/.dr4-rk3588.dtb.dts.tmp index 1b03a6c..1352297 100644 --- a/rk3588/.dr4-rk3588.dtb.dts.tmp +++ b/rk3588/.dr4-rk3588.dtb.dts.tmp @@ -14517,20 +14517,7 @@ /delete-node/ &backlight; # 4 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 -# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-tp-i2c6-gt911.dtsi" 1 -&i2c6 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&i2c6m0_xfer>; - - goodix_ts:goodix_ts@5d { - status = "okay"; - compatible = "goodix,gt9xx"; - reg = <0x5d>; - }; -}; -# 6 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 # 1 "arch/arm64/boot/dts/rockchip/rk3588/rpdzkj_config.dtsi" 1 @@ -14807,22 +14794,7 @@ pinctrl-names = "default"; pinctrl-0 = <&can1m1_pins>; }; -# 210 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" -&spi3 { - - status = "okay"; - max-freq = <48000000>; - dev-port = <1>; - pinctrl-0 = <&spi3m1_cs1 &spi3m1_pins>; - spidev0: spidev@00 { - status = "okay"; - compatible = "rockchip,spidev"; - reg = <0x00>; - spi-max-frequency = <48000000>; - }; -}; - - +# 225 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" &i2c4 { status = "disable"; pinctrl-names = "default"; diff --git a/rk3588/dr4-rk3588.dtb b/rk3588/dr4-rk3588.dtb index ed8a0a2..6812d70 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 6ba70d8..a88d17d 100755 --- a/rk3588/dr4-rk3588.dts +++ b/rk3588/dr4-rk3588.dts @@ -2,7 +2,7 @@ //#include "../rk3588-evb4-lp4-v10-linux.dts" #include "rp-rk3588-board.dtsi" -#include "rp-tp-i2c6-gt911.dtsi" +// #include "rp-tp-i2c6-gt911.dtsi" // #include "rd-rk3588-lcd-gpio.dtsi" #include "rpdzkj_config.dtsi" @@ -207,19 +207,19 @@ // pinctrl-0 = <&can2m1_pins>; // }; -&spi3 { - // status = "disabled"; - status = "okay"; - max-freq = <48000000>; - dev-port = <1>; - pinctrl-0 = <&spi3m1_cs1 &spi3m1_pins>; - spidev0: spidev@00 { - status = "okay"; - compatible = "rockchip,spidev"; - reg = <0x00>; - spi-max-frequency = <48000000>; - }; -}; +// &spi3 { +// // status = "disabled"; +// status = "okay"; +// max-freq = <48000000>; +// dev-port = <1>; +// pinctrl-0 = <&spi3m1_cs1 &spi3m1_pins>; +// spidev0: spidev@00 { +// status = "okay"; +// compatible = "rockchip,spidev"; +// reg = <0x00>; +// spi-max-frequency = <48000000>; +// }; +// }; &i2c4 {