| Message ID | 20221208180603.v2.4.Id132522bda31fd97684cb076a44a0907cd28097d@changeid (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm64: dts: qcom: sc7180: Make pazquel360's touchscreen work | expand |
Hi, On Thu, Dec 8, 2022 at 6:06 PM Douglas Anderson <dianders@chromium.org> wrote: > > The touchscreen was supposed to have been added when pazquel360 first > was added upstream but was missed. Add it now. > > Signed-off-by: Douglas Anderson <dianders@chromium.org> > Reviewed-by: Matthias Kaehlcke <mka@chromium.org> > --- > > (no changes since v1) > > .../dts/qcom/sc7180-trogdor-pazquel360.dtsi | 21 +++++++++++++++++++ > 1 file changed, 21 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi > index 5702325d0c7b..54b89def8402 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi > @@ -14,6 +14,27 @@ &alc5682 { > realtek,dmic-clk-rate-hz = <2048000>; > }; > > +ap_ts_pen_1v8: &i2c4 { > + status = "okay"; > + clock-frequency = <400000>; > + > + ap_ts: touchscreen@10 { > + compatible = "elan,ekth3915", "elan,ekth3500"; > + reg = <0x10>; > + pinctrl-names = "default"; > + pinctrl-0 = <&ts_int_l>, <&ts_reset_l>; > + > + interrupt-parent = <&tlmm>; > + interrupts = <9 IRQ_TYPE_LEVEL_LOW>; > + > + hid-descr-addr = <0x0001>; I happened to re-read this and did a facepalm here. The 'hid-descr-addr' doesn't belong here at all (it's for a totally different type of touchscreen), but it was there in our downstream branch (incorrectly) and I just copied it over. I even had noticed it before, but forgot it yesterday when posting this series. Just to get things out of the way, I'll post a v3 now. Sorry for the noise. -Doug
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi index 5702325d0c7b..54b89def8402 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi @@ -14,6 +14,27 @@ &alc5682 { realtek,dmic-clk-rate-hz = <2048000>; }; +ap_ts_pen_1v8: &i2c4 { + status = "okay"; + clock-frequency = <400000>; + + ap_ts: touchscreen@10 { + compatible = "elan,ekth3915", "elan,ekth3500"; + reg = <0x10>; + pinctrl-names = "default"; + pinctrl-0 = <&ts_int_l>, <&ts_reset_l>; + + interrupt-parent = <&tlmm>; + interrupts = <9 IRQ_TYPE_LEVEL_LOW>; + + hid-descr-addr = <0x0001>; + + vcc33-supply = <&pp3300_ts>; + vccio-supply = <&pp1800_l10a>; + reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>; + }; +}; + &keyboard_controller { function-row-physmap = < MATRIX_KEY(0x00, 0x02, 0) /* T1 */