From 440e68c5ae7b2e4a78ad91f809a91f34429fb007 Mon Sep 17 00:00:00 2001 From: Weixin Zhou Date: Mon, 9 Nov 2020 19:50:52 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3568-evb: adjust touch gt1x configuration Signed-off-by: Weixin Zhou Change-Id: I06be23f54af5a37d556bcf0c2d8287e451df20b3 --- .../boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts | 8 ++------ arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts index 4517ec563163..923b22ed90ae 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts @@ -24,10 +24,10 @@ }; &dsi_panel { - enable-gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>; + power-supply = <&vcc28_lcd_n>; reset-gpios = <&gpio4 RK_PC5 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; - pinctrl-0 = <&lcd_enable_gpio>, <&lcd_rst_gpio>; + pinctrl-0 = <&lcd_rst_gpio>; }; &sdio_pwrseq { @@ -116,10 +116,6 @@ lcd_rst_gpio: lcd-rst-gpio { rockchip,pins = <4 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; }; - - lcd_enable_gpio: lcd-enable-gpio { - rockchip,pins = <0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>; - }; }; wireless-bluetooth { diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi index adc126f86cba..298196b02d62 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi @@ -269,6 +269,17 @@ vin-supply = <&vcc_3v3>; }; + vcc28_lcd_n: vcc28-lcd-n { + compatible = "regulator-fixed"; + regulator-name = "vcc28_lcd_n"; + regulator-boot-on; + gpio = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>; + enable-active-high; + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&rk809 1>; @@ -953,6 +964,7 @@ reg = <0x14>; pinctrl-names = "default"; pinctrl-0 = <&touch_gpio>; + power-supply = <&vcc28_lcd_n>; goodix,rst-gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>; goodix,irq-gpio = <&gpio0 RK_PB5 IRQ_TYPE_LEVEL_LOW>; }; @@ -1037,9 +1049,9 @@ }; touch { - touch_gpio: touch_gpio { - rockchip,pins = - <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, + touch_gpio: touch-gpio { + rockchip,pins = + <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>, <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; }; };