| Message ID | 20220622215805.1121982-1-joebar@chromium.org |
|---|---|
| Headers | show |
| Series | arm64: dts: qcom: sc7180: Add five new trogdor-based boards | expand |
Hi, On Wed, Jun 22, 2022 at 2:59 PM Joseph S. Barrera III <joebar@chromium.org> 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@chromium.org> > --- > > Changes in v10: > - Remove 'include sc7180.dtsi' from *all* sc7180-trogdor-pazquel* files. > - Move "okay" for ap_tp_i2c to proper location. > > 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 | 21 ++ > .../qcom/sc7180-trogdor-pazquel-lte-ti.dts | 21 ++ > .../qcom/sc7180-trogdor-pazquel-parade.dts | 16 ++ > .../dts/qcom/sc7180-trogdor-pazquel-ti.dts | 16 ++ > .../boot/dts/qcom/sc7180-trogdor-pazquel.dtsi | 221 ++++++++++++++++++ > 6 files changed, 299 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..407adca19652 > --- /dev/null > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-lte-parade.dts > @@ -0,0 +1,21 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Google Pazquel board device tree source > + * > + * Copyright 2021 Google LLC. > + */ > + > +/dts-v1/; > + > +#include "sc7180-trogdor-parade-ps8640.dtsi" > +#include "sc7180-trogdor-pazquel.dtsi" > +#include "sc7180-trogdor-lte-sku.dtsi" The includes are still not correct as far as I can tell. If you look at Stephen's solution in "Simplify!" plus his fixup that your series is based on, AKA ("arm64: dts: qcom: Remove duplicate sc7180-trogdor include on lazor/homestar") then I believe the correct thing to do here is: 1. Go back to v9 2. Remove the include of "sc7180-trogdor.dtsi" from the pazquel and kingoftown .dtsi files. 3. Every place in pazquel and kingoftown that has an include of "sc7180.dtsi" replace that with "sc7180-trogdor.dtsi" I'm curious: did you try compiling your patches? Do they work? They don't seem to for me. It's expected that when you post patches that you have, at the very least, compile tested them. Given how much of trogdor works upstream I'd also expect you to have actually boot tested as many of the boards that you have hardware for. -Doug