* [PATCH v2 1/3] arm64: dts: qcom: sc7180-trogdor: Simplify trackpad enabling
2022-04-27 2:03 [PATCH v2 0/3] arm64: dts: qcom: sc7180-trogdor: Simplify! Stephen Boyd
@ 2022-04-27 2:03 ` Stephen Boyd
2022-04-29 0:06 ` Matthias Kaehlcke
2022-04-27 2:03 ` [PATCH v2 2/3] arm64: dts: qcom: sc7180-trogdor: Simplify spi0/spi6 labeling Stephen Boyd
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: Stephen Boyd @ 2022-04-27 2:03 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson
Cc: linux-kernel, patches, linux-arm-msm, Joseph S. Barrera III,
Douglas Anderson
Trogdor boards with a detachable keyboard don't have a trackpad over
i2c. Instead the trackpad is on the detachable keyboard base. Let's move
the enabling of the trackpad i2c bus out of the base sc7180-trogdor.dtsi
file so that each trogdor board that is detachable, of which there are
many, doesn't have to disable the trackpad bus.
Cc: "Joseph S. Barrera III" <joebar@chromium.org>
Cc: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 4 ----
arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 4 ----
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 4 ++++
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 4 ++++
arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 4 ++++
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 -
6 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
index c81805ef2250..8da61a52f150 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
@@ -111,10 +111,6 @@ ap_ts: touchscreen@5d {
};
};
-&i2c7 {
- status = "disabled";
-};
-
&i2c9 {
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
index bff2b556cc75..532c7dcc3f73 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
@@ -88,10 +88,6 @@ map1 {
};
};
-&ap_tp_i2c {
- status = "disabled";
-};
-
ap_ts_pen_1v8: &i2c4 {
status = "okay";
clock-frequency = <400000>;
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
index 69666f92176a..75df5d1633b2 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
@@ -19,6 +19,10 @@ &ap_sar_sensor {
semtech,avg-pos-strength = <64>;
};
+&ap_tp_i2c {
+ status = "okay";
+};
+
/*
* Lazor is stuffed with a 47k NTC as charger thermistor which currently is
* not supported by the PM6150 ADC driver. Disable the charger thermal zone
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
index e90f99ef5323..410ca2a76d81 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
@@ -36,6 +36,10 @@ &alc5682 {
realtek,dmic-clk-driving-high = "true";
};
+&ap_tp_i2c {
+ status = "okay";
+};
+
&cpu6_alert0 {
temperature = <60000>;
};
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
index 457c25499863..311c42a535ff 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
@@ -20,6 +20,10 @@ / {
compatible = "google,trogdor", "qcom,sc7180";
};
+&ap_tp_i2c {
+ status = "okay";
+};
+
ap_ts_pen_1v8: &i2c4 {
status = "okay";
clock-frequency = <400000>;
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index b0efb354458c..7648be83f7e4 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -727,7 +727,6 @@ ap_sar_sensor: proximity@28 {
};
ap_tp_i2c: &i2c7 {
- status = "okay";
clock-frequency = <400000>;
trackpad: trackpad@15 {
--
https://chromeos.dev
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v2 1/3] arm64: dts: qcom: sc7180-trogdor: Simplify trackpad enabling
2022-04-27 2:03 ` [PATCH v2 1/3] arm64: dts: qcom: sc7180-trogdor: Simplify trackpad enabling Stephen Boyd
@ 2022-04-29 0:06 ` Matthias Kaehlcke
0 siblings, 0 replies; 10+ messages in thread
From: Matthias Kaehlcke @ 2022-04-29 0:06 UTC (permalink / raw)
To: Stephen Boyd
Cc: Andy Gross, Bjorn Andersson, linux-kernel, patches,
linux-arm-msm, Joseph S. Barrera III, Douglas Anderson
On Tue, Apr 26, 2022 at 07:03:37PM -0700, Stephen Boyd wrote:
> Trogdor boards with a detachable keyboard don't have a trackpad over
> i2c. Instead the trackpad is on the detachable keyboard base. Let's move
> the enabling of the trackpad i2c bus out of the base sc7180-trogdor.dtsi
> file so that each trogdor board that is detachable, of which there are
> many, doesn't have to disable the trackpad bus.
Makes sense.
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 2/3] arm64: dts: qcom: sc7180-trogdor: Simplify spi0/spi6 labeling
2022-04-27 2:03 [PATCH v2 0/3] arm64: dts: qcom: sc7180-trogdor: Simplify! Stephen Boyd
2022-04-27 2:03 ` [PATCH v2 1/3] arm64: dts: qcom: sc7180-trogdor: Simplify trackpad enabling Stephen Boyd
@ 2022-04-27 2:03 ` Stephen Boyd
2022-04-29 0:12 ` Matthias Kaehlcke
2022-04-27 2:03 ` [PATCH v2 3/3] arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi Stephen Boyd
2022-05-06 15:03 ` [PATCH v2 0/3] arm64: dts: qcom: sc7180-trogdor: Simplify! Bjorn Andersson
3 siblings, 1 reply; 10+ messages in thread
From: Stephen Boyd @ 2022-04-27 2:03 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson
Cc: linux-kernel, patches, linux-arm-msm, Joseph S. Barrera III,
Douglas Anderson
We had to do this spi0/spi6 flip-flop on trogdor-r0 because the spi
buses got swizzled between r0 and r1. The swizzle stopped after r1, but
we kept this around to support either hardware possibility and to keep
trogdor-r0 working.
trogdor-r0 isn't supported upstream, so this swizzle is not doing
anything besides making a pattern that others tryt to copy for the EC and
H1 nodes. Let's remove it and simplify the dts files.
Cc: "Joseph S. Barrera III" <joebar@chromium.org>
Cc: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 6 +-----
arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 3 ---
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 3 ---
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 4 ----
arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 4 ----
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 4 ++--
6 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
index 8da61a52f150..ac2279142a95 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
@@ -6,14 +6,10 @@
*/
#include "sc7180.dtsi"
-
-ap_ec_spi: &spi6 {};
-ap_h1_spi: &spi0 {};
-
#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
-/* Deleted nodes from trogdor.dtsi */
+/* Deleted nodes from sc7180-trogdor.dtsi */
/delete-node/ &alc5682;
/delete-node/ &pp3300_codec;
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
index 532c7dcc3f73..9b3e3d13c165 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
@@ -5,9 +5,6 @@
* Copyright 2021 Google LLC.
*/
-ap_ec_spi: &spi6 {};
-ap_h1_spi: &spi0 {};
-
#include "sc7180-trogdor.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
index 75df5d1633b2..fe2369c29aad 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
@@ -5,9 +5,6 @@
* Copyright 2020 Google LLC.
*/
-ap_ec_spi: &spi6 {};
-ap_h1_spi: &spi0 {};
-
#include "sc7180-trogdor.dtsi"
&ap_sar_sensor {
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
index 410ca2a76d81..3bca7545ffe5 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
@@ -6,10 +6,6 @@
*/
#include "sc7180.dtsi"
-
-ap_ec_spi: &spi6 {};
-ap_h1_spi: &spi0 {};
-
#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 311c42a535ff..6c822c84112a 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
@@ -8,10 +8,6 @@
/dts-v1/;
#include "sc7180.dtsi"
-
-ap_ec_spi: &spi6 {};
-ap_h1_spi: &spi0 {};
-
#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 7648be83f7e4..ea5bedc3d1cb 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -626,7 +626,7 @@ src_vreg_bob: bob {
};
};
-&ap_ec_spi {
+ap_ec_spi: &spi6 {
status = "okay";
cros_ec: ec@0 {
compatible = "google,cros-ec-spi";
@@ -675,7 +675,7 @@ usb_c1: connector@1 {
};
};
-&ap_h1_spi {
+ap_h1_spi: &spi0 {
status = "okay";
cr50: tpm@0 {
compatible = "google,cr50";
--
https://chromeos.dev
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v2 2/3] arm64: dts: qcom: sc7180-trogdor: Simplify spi0/spi6 labeling
2022-04-27 2:03 ` [PATCH v2 2/3] arm64: dts: qcom: sc7180-trogdor: Simplify spi0/spi6 labeling Stephen Boyd
@ 2022-04-29 0:12 ` Matthias Kaehlcke
0 siblings, 0 replies; 10+ messages in thread
From: Matthias Kaehlcke @ 2022-04-29 0:12 UTC (permalink / raw)
To: Stephen Boyd
Cc: Andy Gross, Bjorn Andersson, linux-kernel, patches,
linux-arm-msm, Joseph S. Barrera III, Douglas Anderson
On Tue, Apr 26, 2022 at 07:03:38PM -0700, Stephen Boyd wrote:
> We had to do this spi0/spi6 flip-flop on trogdor-r0 because the spi
> buses got swizzled between r0 and r1. The swizzle stopped after r1, but
> we kept this around to support either hardware possibility and to keep
> trogdor-r0 working.
>
> trogdor-r0 isn't supported upstream, so this swizzle is not doing
> anything besides making a pattern that others tryt to copy for the EC and
> H1 nodes. Let's remove it and simplify the dts files.
>
> Cc: "Joseph S. Barrera III" <joebar@chromium.org>
> Cc: Douglas Anderson <dianders@chromium.org>
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 3/3] arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi
2022-04-27 2:03 [PATCH v2 0/3] arm64: dts: qcom: sc7180-trogdor: Simplify! Stephen Boyd
2022-04-27 2:03 ` [PATCH v2 1/3] arm64: dts: qcom: sc7180-trogdor: Simplify trackpad enabling Stephen Boyd
2022-04-27 2:03 ` [PATCH v2 2/3] arm64: dts: qcom: sc7180-trogdor: Simplify spi0/spi6 labeling Stephen Boyd
@ 2022-04-27 2:03 ` Stephen Boyd
2022-04-29 0:30 ` Matthias Kaehlcke
2022-05-20 22:16 ` Doug Anderson
2022-05-06 15:03 ` [PATCH v2 0/3] arm64: dts: qcom: sc7180-trogdor: Simplify! Bjorn Andersson
3 siblings, 2 replies; 10+ messages in thread
From: Stephen Boyd @ 2022-04-27 2:03 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson
Cc: linux-kernel, patches, linux-arm-msm, Joseph S. Barrera III,
Douglas Anderson
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" <joebar@chromium.org>
Cc: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2 3/3] arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi
2022-04-27 2:03 ` [PATCH v2 3/3] arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi Stephen Boyd
@ 2022-04-29 0:30 ` Matthias Kaehlcke
2022-05-20 22:16 ` Doug Anderson
1 sibling, 0 replies; 10+ messages in thread
From: Matthias Kaehlcke @ 2022-04-29 0:30 UTC (permalink / raw)
To: Stephen Boyd
Cc: Andy Gross, Bjorn Andersson, linux-kernel, patches,
linux-arm-msm, Joseph S. Barrera III, Douglas Anderson
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" <joebar@chromium.org>
> Cc: Douglas Anderson <dianders@chromium.org>
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 3/3] arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi
2022-04-27 2:03 ` [PATCH v2 3/3] arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi Stephen Boyd
2022-04-29 0:30 ` Matthias Kaehlcke
@ 2022-05-20 22:16 ` Doug Anderson
2022-05-20 23:16 ` Stephen Boyd
1 sibling, 1 reply; 10+ messages in thread
From: Doug Anderson @ 2022-05-20 22:16 UTC (permalink / raw)
To: Stephen Boyd
Cc: Andy Gross, Bjorn Andersson, LKML, patches, linux-arm-msm,
Joseph S. Barrera III
Hi,
On Tue, Apr 26, 2022 at 7:03 PM Stephen Boyd <swboyd@chromium.org> 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" <joebar@chromium.org>
> Cc: Douglas Anderson <dianders@chromium.org>
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>
> ---
> 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
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v2 3/3] arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi
2022-05-20 22:16 ` Doug Anderson
@ 2022-05-20 23:16 ` Stephen Boyd
0 siblings, 0 replies; 10+ messages in thread
From: Stephen Boyd @ 2022-05-20 23:16 UTC (permalink / raw)
To: Doug Anderson
Cc: Andy Gross, Bjorn Andersson, LKML, patches, linux-arm-msm,
Joseph S. Barrera III
Quoting Doug Anderson (2022-05-20 15:16:03)
> On Tue, Apr 26, 2022 at 7:03 PM Stephen Boyd <swboyd@chromium.org> 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/20220520231355.1559104-1-swboyd@chromium.org
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/3] arm64: dts: qcom: sc7180-trogdor: Simplify!
2022-04-27 2:03 [PATCH v2 0/3] arm64: dts: qcom: sc7180-trogdor: Simplify! Stephen Boyd
` (2 preceding siblings ...)
2022-04-27 2:03 ` [PATCH v2 3/3] arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi Stephen Boyd
@ 2022-05-06 15:03 ` Bjorn Andersson
3 siblings, 0 replies; 10+ messages in thread
From: Bjorn Andersson @ 2022-05-06 15:03 UTC (permalink / raw)
To: Stephen Boyd, Andy Gross
Cc: linux-kernel, Douglas Anderson, patches, Joseph S. Barrera III,
linux-arm-msm
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 <bjorn.andersson@linaro.org>
^ permalink raw reply [flat|nested] 10+ messages in thread