Here's a couple patches to simplify sc7180-trogdor dtsi files further.
There will be logical conflicts with the wormdingler patch because it
will need to have similar changes done for the swizzle and include, but
that can be cleaned up later or I can resend if the wormdingler patch
gets merged first. Either way nothing will be broken from what I can
tell.
I compiled these and diffed the dtbs before and after and found no
changes.
Changes from v1 (https://lore.kernel.org/r/[email protected]):
* Another patch to move around sc7180.dtsi includes
* Fixed trackpad for trogdor-r1 and pompom
* Made spi0/spi6 patch not as aggressive
Stephen Boyd (3):
arm64: dts: qcom: sc7180-trogdor: Simplify trackpad enabling
arm64: dts: qcom: sc7180-trogdor: Simplify spi0/spi6 labeling
arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 11 +----------
.../boot/dts/qcom/sc7180-trogdor-homestar-r2.dts | 2 +-
.../boot/dts/qcom/sc7180-trogdor-homestar-r3.dts | 2 +-
.../boot/dts/qcom/sc7180-trogdor-homestar-r4.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 7 -------
.../qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts | 2 +-
.../qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts | 2 +-
.../dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts | 2 +-
.../dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 2 +-
.../boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 2 +-
.../boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 2 +-
.../boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts | 2 +-
.../boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 7 ++++---
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 9 ++++-----
arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 9 ++++-----
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 8 ++++----
21 files changed, 32 insertions(+), 49 deletions(-)
Cc: "Joseph S. Barrera III" <[email protected]>
Cc: Douglas Anderson <[email protected]>
base-commit: f238ff81e8946540e1a7c1496aa92fa2386893dc
--
https://chromeos.dev
The SoC is always present on sc7180-trogdor.dtsi and thus we should
include it in the "generic" dtsi file for trogdor. Previously we had
removed it from there because we had to do the spi6/spi0 swizzle, so
each trogdor variant board had to include sc7180.dtsi and then
sc7180-trogdor.dtsi so that the latter dtsi file could modify the right
spi bus for EC and H1 properties that are common to all trogdor boards.
Now that we're done with that we can replace sc7180.dtsi includes with
sc7180-trogdor.dtsi and include sc7180.dtsi in sc7180-trogdor.dtsi as
was originally intended. We still need to include sc7180-trogdor.dtsi
before the bridge dtsi files though because those rely on the panel
label.
Cc: "Joseph S. Barrera III" <[email protected]>
Cc: Douglas Anderson <[email protected]>
Signed-off-by: Stephen Boyd <[email protected]>
---
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 1 -
arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r2.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r3.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dts | 2 +-
.../boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts | 2 +-
.../boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 1 -
arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 1 -
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 3 ++-
19 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
index ac2279142a95..8ac1f1e61006 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
@@ -5,7 +5,6 @@
* Copyright 2020 Google LLC.
*/
-#include "sc7180.dtsi"
#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r2.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r2.dts
index 70032983fb65..d9e905ed4e62 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r2.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r2.dts
@@ -7,7 +7,7 @@
/dts-v1/;
-#include "sc7180.dtsi"
+#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
#include "sc7180-trogdor-homestar.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r3.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r3.dts
index e92e2e9e48ed..242c178fdc52 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r3.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r3.dts
@@ -7,7 +7,7 @@
/dts-v1/;
-#include "sc7180.dtsi"
+#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
#include "sc7180-trogdor-homestar.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dts
index 0de0c97f5728..66dd87016201 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dts
@@ -7,7 +7,7 @@
/dts-v1/;
-#include "sc7180.dtsi"
+#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-parade-ps8640.dtsi"
#include "sc7180-trogdor-homestar.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts
index f360ff27226e..235cda2bba5e 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts
@@ -7,7 +7,7 @@
/dts-v1/;
-#include "sc7180.dtsi"
+#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
#include "sc7180-trogdor-lte-sku.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts
index c44ed54af690..913b5fc3ba76 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts
@@ -7,7 +7,7 @@
/dts-v1/;
-#include "sc7180.dtsi"
+#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-parade-ps8640.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
#include "sc7180-trogdor-lte-sku.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts
index 42b4bbcc76f4..d42dcd421146 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts
@@ -7,7 +7,7 @@
/dts-v1/;
-#include "sc7180.dtsi"
+#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
#include "sc7180-trogdor-lte-sku.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts
index dc47842bc662..15d77dc5f956 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts
@@ -7,7 +7,7 @@
/dts-v1/;
-#include "sc7180.dtsi"
+#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-parade-ps8640.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
#include "sc7180-trogdor-lte-sku.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
index b142006478ea..bfbf26fd2cd4 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
@@ -7,7 +7,7 @@
/dts-v1/;
-#include "sc7180.dtsi"
+#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
index 59740799fa3a..d45a59afd7fc 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
@@ -7,7 +7,7 @@
/dts-v1/;
-#include "sc7180.dtsi"
+#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts
index 18ef9da71998..6ff81c1f7c44 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts
@@ -7,7 +7,7 @@
/dts-v1/;
-#include "sc7180.dtsi"
+#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
#include "sc7180-lite.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts
index 8913592b2d82..e58e36e35950 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts
@@ -7,7 +7,7 @@
/dts-v1/;
-#include "sc7180.dtsi"
+#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
#include "sc7180-trogdor-lte-sku.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts
index 7adcedbf080d..76c83f88cb41 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts
@@ -7,7 +7,7 @@
/dts-v1/;
-#include "sc7180.dtsi"
+#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
#include "sc7180-lite.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts
index 7f5c015e1ecb..960f7b7ce094 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts
@@ -7,7 +7,7 @@
/dts-v1/;
-#include "sc7180.dtsi"
+#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-parade-ps8640.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
#include "sc7180-lite.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts
index 8107f3d932eb..38027f13b9d0 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts
@@ -7,7 +7,7 @@
/dts-v1/;
-#include "sc7180.dtsi"
+#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-parade-ps8640.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
#include "sc7180-trogdor-lte-sku.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts
index 83f6a4eb5ae5..56dd222650d3 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts
@@ -7,7 +7,7 @@
/dts-v1/;
-#include "sc7180.dtsi"
+#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-parade-ps8640.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
#include "sc7180-lite.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
index 3bca7545ffe5..4841d42c8c62 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
@@ -5,7 +5,6 @@
* Copyright 2020 Google LLC.
*/
-#include "sc7180.dtsi"
#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
index 6c822c84112a..352827e5740a 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
@@ -7,7 +7,6 @@
/dts-v1/;
-#include "sc7180.dtsi"
#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index ea5bedc3d1cb..e55dbaa6dc12 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -11,7 +11,8 @@
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
#include <dt-bindings/sound/sc7180-lpass.h>
-/* PMICs depend on spmi_bus label and so must come after SoC */
+#include "sc7180.dtsi"
+/* PMICs depend on spmi_bus label and so must come after sc7180.dtsi */
#include "pm6150.dtsi"
#include "pm6150l.dtsi"
--
https://chromeos.dev
On Tue, Apr 26, 2022 at 07:03:39PM -0700, Stephen Boyd wrote:
> The SoC is always present on sc7180-trogdor.dtsi and thus we should
> include it in the "generic" dtsi file for trogdor. Previously we had
> removed it from there because we had to do the spi6/spi0 swizzle, so
> each trogdor variant board had to include sc7180.dtsi and then
> sc7180-trogdor.dtsi so that the latter dtsi file could modify the right
> spi bus for EC and H1 properties that are common to all trogdor boards.
>
> Now that we're done with that we can replace sc7180.dtsi includes with
> sc7180-trogdor.dtsi and include sc7180.dtsi in sc7180-trogdor.dtsi as
> was originally intended. We still need to include sc7180-trogdor.dtsi
> before the bridge dtsi files though because those rely on the panel
> label.
>
> Cc: "Joseph S. Barrera III" <[email protected]>
> Cc: Douglas Anderson <[email protected]>
> Signed-off-by: Stephen Boyd <[email protected]>
Reviewed-by: Matthias Kaehlcke <[email protected]>
On Tue, 26 Apr 2022 19:03:36 -0700, Stephen Boyd wrote:
> Here's a couple patches to simplify sc7180-trogdor dtsi files further.
> There will be logical conflicts with the wormdingler patch because it
> will need to have similar changes done for the swizzle and include, but
> that can be cleaned up later or I can resend if the wormdingler patch
> gets merged first. Either way nothing will be broken from what I can
> tell.
>
> [...]
Applied, thanks!
[1/3] arm64: dts: qcom: sc7180-trogdor: Simplify trackpad enabling
commit: 51d30402be7506db007af6d29c6bc7c1cefcc82f
[2/3] arm64: dts: qcom: sc7180-trogdor: Simplify spi0/spi6 labeling
commit: d277cab7afc7b54ea91808c0895d78c2021af534
[3/3] arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi
commit: 19794489fa2474a55c00848e00ca3d15ea01d36c
Best regards,
--
Bjorn Andersson <[email protected]>
Quoting Doug Anderson (2022-05-20 15:16:03)
> On Tue, Apr 26, 2022 at 7:03 PM Stephen Boyd <[email protected]> wrote:
> > arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 1 -
> > arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 1 -
> > arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 3 ++-
> > 19 files changed, 17 insertions(+), 19 deletions(-)
>
> While reviewing a different change, I found something fishy and
> tracked it down to ${SUBJECT} patch.
>
> Specifically, after ${SUBJECT} patch then I run `git grep
> include.*trogdor.dtsi`. When I do that, I see that
> `sc7180-trogdor.dtsi` is double-included in all lazor devices. :( It's
> included in the actual dts files and also in the lazor.dtsi file.
>
> That's probably not right. I think we need to remove the one in the
> lazor.dtsi file?
>
Good catch! I sent a patch to fix it[1]. I recall I compiled
before/after and didn't see any difference, so I suspect it's just a
waste of time during the compilation phase but otherwise not causing a
problem.
[1] https://lore.kernel.org/r/[email protected]
Hi,
On Tue, Apr 26, 2022 at 7:03 PM Stephen Boyd <[email protected]> wrote:
>
> The SoC is always present on sc7180-trogdor.dtsi and thus we should
> include it in the "generic" dtsi file for trogdor. Previously we had
> removed it from there because we had to do the spi6/spi0 swizzle, so
> each trogdor variant board had to include sc7180.dtsi and then
> sc7180-trogdor.dtsi so that the latter dtsi file could modify the right
> spi bus for EC and H1 properties that are common to all trogdor boards.
>
> Now that we're done with that we can replace sc7180.dtsi includes with
> sc7180-trogdor.dtsi and include sc7180.dtsi in sc7180-trogdor.dtsi as
> was originally intended. We still need to include sc7180-trogdor.dtsi
> before the bridge dtsi files though because those rely on the panel
> label.
>
> Cc: "Joseph S. Barrera III" <[email protected]>
> Cc: Douglas Anderson <[email protected]>
> Signed-off-by: Stephen Boyd <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 1 -
> arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r2.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r3.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dts | 2 +-
> .../boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts | 2 +-
> .../boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 1 -
> arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 1 -
> arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 3 ++-
> 19 files changed, 17 insertions(+), 19 deletions(-)
While reviewing a different change, I found something fishy and
tracked it down to ${SUBJECT} patch.
Specifically, after ${SUBJECT} patch then I run `git grep
include.*trogdor.dtsi`. When I do that, I see that
`sc7180-trogdor.dtsi` is double-included in all lazor devices. :( It's
included in the actual dts files and also in the lazor.dtsi file.
That's probably not right. I think we need to remove the one in the
lazor.dtsi file?
-Doug