取消触摸屏对IO的占用

This commit is contained in:
zhangpeng 2025-06-23 10:44:38 +08:00
parent d93093af17
commit eb489d7a41
5 changed files with 15 additions and 45 deletions

View File

@ -32,7 +32,6 @@ deps_arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dtb := \
scripts/dtc/include-prefixes/dt-bindings/sensor-dev.h \ 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-rk806-single.dtsi \
arch/arm64/boot/dts/rockchip/rk3588/../rk3588-linux.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/rpdzkj_config.dtsi \
arch/arm64/boot/dts/rockchip/rk3588/rp-usb-host.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-gmac0.dtsi \

View File

@ -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 \ 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-rk806-single.dtsi \
arch/arm64/boot/dts/rockchip/rk3588/../rk3588-linux.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/rpdzkj_config.dtsi \
arch/arm64/boot/dts/rockchip/rk3588/rp-usb-host.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-gmac0.dtsi \

View File

@ -14517,20 +14517,7 @@
/delete-node/ &backlight; /delete-node/ &backlight;
# 4 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 # 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 # 1 "arch/arm64/boot/dts/rockchip/rk3588/rpdzkj_config.dtsi" 1
@ -14807,22 +14794,7 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&can1m1_pins>; pinctrl-0 = <&can1m1_pins>;
}; };
# 210 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" # 225 "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>;
};
};
&i2c4 { &i2c4 {
status = "disable"; status = "disable";
pinctrl-names = "default"; pinctrl-names = "default";

Binary file not shown.

View File

@ -2,7 +2,7 @@
//#include "../rk3588-evb4-lp4-v10-linux.dts" //#include "../rk3588-evb4-lp4-v10-linux.dts"
#include "rp-rk3588-board.dtsi" #include "rp-rk3588-board.dtsi"
#include "rp-tp-i2c6-gt911.dtsi" // #include "rp-tp-i2c6-gt911.dtsi"
// #include "rd-rk3588-lcd-gpio.dtsi" // #include "rd-rk3588-lcd-gpio.dtsi"
#include "rpdzkj_config.dtsi" #include "rpdzkj_config.dtsi"
@ -207,19 +207,19 @@
// pinctrl-0 = <&can2m1_pins>; // pinctrl-0 = <&can2m1_pins>;
// }; // };
&spi3 { // &spi3 {
// status = "disabled"; // // status = "disabled";
status = "okay"; // status = "okay";
max-freq = <48000000>; // max-freq = <48000000>;
dev-port = <1>; // dev-port = <1>;
pinctrl-0 = <&spi3m1_cs1 &spi3m1_pins>; // pinctrl-0 = <&spi3m1_cs1 &spi3m1_pins>;
spidev0: spidev@00 { // spidev0: spidev@00 {
status = "okay"; // status = "okay";
compatible = "rockchip,spidev"; // compatible = "rockchip,spidev";
reg = <0x00>; // reg = <0x00>;
spi-max-frequency = <48000000>; // spi-max-frequency = <48000000>;
}; // };
}; // };
&i2c4 { &i2c4 {