Hi, On Mon, Jun 20, 2022 at 10:35 PM Joseph S. Barrera III <joebar@xxxxxxxxxxxx> wrote: > > Pazquel is a trogdor-based board. These dts files are unchanged copies > from the downstream Chrome OS 5.4 kernel. > > Signed-off-by: Joseph S. Barrera III <joebar@xxxxxxxxxxxx> > --- > > Changes in v9: > - Restore two lines accidentally removed from ap_sar_sensor. > - Simplify trackpad enabling (51d30402be75). > > Changes in v7: > - Only include sc7180.dtsi in sc7180-trogdor.dtsi (19794489fa24). > - Simplify spi0/spi6 labeling (d277cab7afc7). > - Remove #include of <arm/cros-ec-keyboard.dtsi>. > - Accidentally removed two lines from ap_sar_sensor. > > Changes in v6: > - Copy changes to ap_sar_sensor from v5.4. > - Add #include of <arm/cros-ec-keyboard.dtsi>. > > Changes in v4: > - Fix description (no downstream bits removed). > - Add missing version history. > > Changes in v3: > - First inclusion in series. > > arch/arm64/boot/dts/qcom/Makefile | 4 + > .../sc7180-trogdor-pazquel-lte-parade.dts | 22 ++ > .../qcom/sc7180-trogdor-pazquel-lte-ti.dts | 22 ++ > .../qcom/sc7180-trogdor-pazquel-parade.dts | 17 ++ > .../dts/qcom/sc7180-trogdor-pazquel-ti.dts | 17 ++ > .../boot/dts/qcom/sc7180-trogdor-pazquel.dtsi | 221 ++++++++++++++++++ > 6 files changed, 303 insertions(+) > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-lte-parade.dts > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-lte-ti.dts > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-parade.dts > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-ti.dts > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi > > diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile > index 5cfd6316768c..dc26704dfe34 100644 > --- a/arch/arm64/boot/dts/qcom/Makefile > +++ b/arch/arm64/boot/dts/qcom/Makefile > @@ -79,6 +79,10 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-mrbland-rev0-auo.dtb > dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-mrbland-rev0-boe.dtb > dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-mrbland-rev1-auo.dtb > dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-mrbland-rev1-boe.dtb > +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-parade.dtb > +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-ti.dtb > +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-parade.dtb > +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-ti.dtb > dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r1.dtb > dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r1-lte.dtb > dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r2.dtb > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-lte-parade.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-lte-parade.dts > new file mode 100644 > index 000000000000..ecedab8d1662 > --- /dev/null > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-lte-parade.dts > @@ -0,0 +1,22 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Google Pazquel board device tree source > + * > + * Copyright 2021 Google LLC. > + */ > + > +/dts-v1/; > + > +#include "sc7180.dtsi" Repeating my comment from v8: This is not good and was an important part of "Simplify!" sc7180.dtsi should only be included by sc7180-trogdor.dtsi. > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi > new file mode 100644 > index 000000000000..5485f50f89ad > --- /dev/null > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi > @@ -0,0 +1,221 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Google Pazquel board device tree source > + * > + * Copyright 2021 Google LLC. > + */ > + > +#include "sc7180-trogdor.dtsi" > + > +&ap_sar_sensor { > + compatible = "semtech,sx9324"; > + semtech,ph0-pin = <1 3 3>; > + semtech,ph1-pin = <3 1 3>; > + semtech,ph2-pin = <1 3 3>; > + semtech,ph3-pin = <0 0 0>; > + semtech,ph01-resolution = <1024>; > + semtech,ph23-resolution = <1024>; > + semtech,startup-sensor = <1>; > + semtech,ph01-proxraw-strength = <3>; > + semtech,ph23-proxraw-strength = <1>; > + semtech,avg-pos-strength = <128>; > + semtech,input-analog-gain = <0>; > + semtech,cs-idle-sleep = "gnd"; > + > + /delete-property/ svdd-supply; > + vdd-supply = <&pp1800_prox>; > +}; > + > +/delete-node/&trackpad; > +&ap_tp_i2c { You need status = "okay"; here since Stephen's "Simplify!" patch series means that the i2c node itself is now disabled by default. > + trackpad: trackpad@15 { > + status = "okay"; You _don't_ need the status = "okay"; here. -Doug