From 2baf8fc47d53f6d59aba79a3deff48071c687bbf Mon Sep 17 00:00:00 2001 From: Wangqiang Guo Date: Fri, 12 Nov 2021 15:46:51 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3588-evb: move touch pinctrl to rk3588-evbx.dtsi Signed-off-by: Wangqiang Guo Change-Id: I91fb070f4bd09a47db4967ca2bb458179c31f459 --- arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi | 10 --------- .../boot/dts/rockchip/rk3588-evb1-lp4.dtsi | 8 +++++++ .../boot/dts/rockchip/rk3588-evb4-lp4.dtsi | 4 ++-- .../boot/dts/rockchip/rk3588-evb5-lp4.dtsi | 22 ------------------- 4 files changed, 10 insertions(+), 34 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi index 9dcb525e7167..12d6ca703dc5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi @@ -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>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi index f8945df3eea4..a387380a6782 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi @@ -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>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi index 3e19d9018487..134533c6181c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi @@ -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>; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb5-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb5-lp4.dtsi index 9f0d3de4b4b1..6cdc835f97e0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb5-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb5-lp4.dtsi @@ -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";