shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

arm64: dts: rockchip: rk3588-evb: move touch pinctrl to rk3588-evbx.dtsi

Browse Source 
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: I91fb070f4bd09a47db4967ca2bb458179c31f459
This commit is contained in:
Wangqiang Guo
2021-11-12 15:46:51 +08:00
committed by Tao Huang
parent 8cdc87137f
commit 2baf8fc47d
4 changed files with 10 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi
View File

@@ -851,16 +851,6 @@
&i2s0_sdo0>;
};
&pinctrl {
touch {
touch_gpio: touch-gpio {
rockchip,pins =
<0 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>,
<0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};
&saradc {
status = "okay";
vref-supply = <&vcc_1v8_s0>;

8
arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi
View File

@@ -351,6 +351,14 @@
};
};
touch {
touch_gpio: touch-gpio {
rockchip,pins =
<0 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>,
<0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb {
vcc5v0_host_en: vcc5v0-host-en {
rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;

4
arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi
View File

@@ -182,8 +182,8 @@
touch {
touch_gpio: touch-gpio {
rockchip,pins =
<0 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>,
<0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
<0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>,
<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

22
arch/arm64/boot/dts/rockchip/rk3588-evb5-lp4.dtsi
View File

@@ -128,18 +128,6 @@
status = "okay";
};
&i2c6 {
status = "okay";
gt1x: gt1x@14 {
compatible = "goodix,gt1x";
reg = <0x14>;
pinctrl-names = "default";
pinctrl-0 = <&touch_gpio>;
goodix,rst-gpio = <&gpio0 RK_PD2 GPIO_ACTIVE_HIGH>;
goodix,irq-gpio = <&gpio0 RK_PD3 IRQ_TYPE_LEVEL_LOW>;
};
};
&i2s3_2ch {
status = "okay";
/delete-property/ pinctrl-names;
@@ -189,16 +177,6 @@
status = "okay";
};
&pinctrl {
touch {
touch_gpio: touch-gpio {
rockchip,pins =
<0 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>,
<0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};
&spdif_tx1 {
status = "okay";
pinctrl-names = "default";