mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 04:29:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

arm64: dts: qcom: sc7280: Add touchscreen to villager

Browse Source 
This adds the touchscreen to the sc7280-herobrine-villager device
tree. Note that the touchscreen on villager actually uses the reset
line and thus we use the more specific "elan,ekth6915" compatible
which allows us to specify the reset.

The fact that villager's touchscreen uses the reset line can be
contrasted against the touchscreen for CRD/herobrine-r1. On those
boards, even though the touchscreen goes to the display, it's not
hooked up to anything there.

In order to keep the line parked on herobrine/CRD, we'll move the
pullup from the qcard.dtsi file to the specific boards. This allows us
to disable the pullup in the villager device tree since the pin is an
output.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220524134840.1.I80072b8815ac08c12af8f379a33cc2d83693dc51@changeid
This commit is contained in:
Douglas Anderson
2022-05-24 13:48:49 -07:00
committed by Bjorn Andersson
parent a4c1fc8cff
commit e58539532b
4 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
View File

@@ -135,6 +135,17 @@ &sdhc_2 {
status = "okay";
};
/* PINCTRL - ADDITIONS TO NODES IN PARENT DEVICE TREE FILES */
/*
* This pin goes to the display panel but then doesn't actually do anything
* on the panel itself (it doesn't connect to the touchscreen controller).
* We'll set a pullup here just to park the line.
*/
&ts_rst_conn {
bias-pull-up;
};
/* PINCTRL - BOARD-SPECIFIC */
/*

11
arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts
View File

@@ -128,6 +128,17 @@ &sdhc_2 {
status = "okay";
};
/* PINCTRL - ADDITIONS TO NODES IN PARENT DEVICE TREE FILES */
/*
* This pin goes to the display panel but then doesn't actually do anything
* on the panel itself (it doesn't connect to the touchscreen controller).
* We'll set a pullup here just to park the line.
*/
&ts_rst_conn {
bias-pull-up;
};
/* PINCTRL - BOARD-SPECIFIC */
/*

25
arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts
View File

@@ -46,6 +46,25 @@ trackpad: trackpad@2c {
};
};
ts_i2c: &i2c13 {
status = "okay";
clock-frequency = <400000>;
ap_ts: touchscreen@10 {
compatible = "elan,ekth6915";
reg = <0x10>;
pinctrl-names = "default";
pinctrl-0 = <&ts_int_conn>, <&ts_rst_conn>;
interrupt-parent = <&tlmm>;
interrupts = <55 IRQ_TYPE_LEVEL_LOW>;
reset-gpios = <&tlmm 54 GPIO_ACTIVE_LOW>;
vcc33-supply = <&ts_avdd>;
};
};
&ap_sar_sensor_i2c {
status = "okay";
};
@@ -81,6 +100,12 @@ &sdhc_1 {
status = "okay";
};
/* PINCTRL - ADDITIONS TO NODES IN PARENT DEVICE TREE FILES */
&ts_rst_conn {
bias-disable;
};
/* PINCTRL - BOARD-SPECIFIC */
/*

1
arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi
View File

@@ -604,7 +604,6 @@ ts_int_conn: ts-int-conn {
ts_rst_conn: ts-rst-conn {
pins = "gpio54";
function = "gpio";
bias-pull-up;
drive-strength = <2>;
};
};