Skip to contentSkip to conversation

arm64: dts: qcom: Update sc7180-trogdor variants from downstream

PATCH Applied Douglas Anderson 3 participants 25 messages Mar 1, 2021 – Mar 8, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v2 cover arm64: dts: qcom: Update sc7180-trogdor variants from downstream

The point of this series is to catch upstream up to what we have downstream in terms of sc7180-trogdor variants. Notably:
- It incorporates minor changes that snuck into the trogdor and lazor device tree files since they were posted upstream.
- It adds the "Limozeen" SKU variant of Lazor.
- It adds support the Pompom and CoachZ type trogdor boards.

This series was tested on the "for-next" Qualcomm tree at commit d242adf2067e ("Merge branch 'arm64-for-5.13' into for-next").
- The patch ("arm64: dts: qcom: sc7180: Use pdc interrupts for USB instead of GIC interrupts") [1] just because it reduced diffs and seemed ready to go.
- The patch ("arm64: dts: qcom: sc7180: Avoid glitching SPI CS at bootup on trogdor") [2] because that's an important bugfix.

With all these changes things are in pretty good shape. Looking at diffs compared to downstream w/ a few patches [3]:
- I haven't tried to resolve "sound" with upstream, instead stripping / leaving as-is any audio related nodes. Someone with more knowledge of the current state of audio needs to take a pass here.
- I haven't tried to resolve DP with upstream. It's basically not there. Someone who works on this: please help!
- We have a downstream patch to manage power for USB hubs. Without that we have to keep power on all the time for USB. Matthias is still working on trying to get an agreement for how that should work.
- Downstream we have an early version of the "sleep stats" driver landed. I believe this is in Maulik's court to re-post.

I have tested this series on "lazor", "lazor-limozeen", "pompom" and "coachz". All of them boot to the web browser with this patch series.

[1] https://lore.kernel.org/r/[email protected]
[2] https://lore.kernel.org/r/20210218145456.1.I1da01a075dd86e005152f993b2d5d82dd9686238@changeid
[3] https://chromium.googlesource.com/chromiumos/third_party/kernel/+log/refs/sandbox/dianders/210225-downstream-dts

Changes in v2:
- Add link to Acked bindings.
- Proper compatible for the "correct" panel (added -ea1 suffix).
- Rebase atop commit 7822de1a2946 ("arm64:...1 for charger temperature")
- Removed "i2c_wlc" as Stephen suggested.
- lazor => trogdor in subject

Abhishek Kumar (1):
arm64: dts: qcom: sc7180: add GO_LAZOR variant property for lazor

Alexandru M Stan (1):
arm64: dts: qcom: sc7180-trogdor: Remove fp control pins in prep for
coachz

Douglas Anderson (6):
arm64: dts: qcom: Move sc7180 MI2S config to board files and make
pulldown
arm64: dts: qcom: Prep sc7180-trogdor trackpad IRQ for new boards
arm64: dts: qcom: Unify the sc7180-trogdor panel nodes
arm64: dts: qcom: Add sc7180-lazor-limozeen skus
arm64: dts: qcom: Add sc7180-trogdor-pompom skus
arm64: dts: qcom: Add sc7180-trogdor-coachz skus

Matthias Kaehlcke (1):
arm64: dts: qcom: sc7180: Set up lazor r3+ as sc7180-lite SKUs

Stephen Boyd (3):
arm64: dts: qcom: sc7180: Update dts for DP phy inside QMP phy
arm64: dts: qcom: trogdor: Only wakeup from pen eject
arm64: dts: qcom: Disable camera clk on sc7180-trogdor devices by
default

Venkata Lakshmi Narayana Gubba (1):
arm64: dts: qcom: sc7180: Remove clock for bluetooth on Trogdor

 arch/arm64/boot/dts/qcom/Makefile             |  11 +
 .../dts/qcom/sc7180-trogdor-coachz-r1-lte.dts |  18 ++
 .../dts/qcom/sc7180-trogdor-coachz-r1.dts     | 154 ++++++++++
 .../dts/qcom/sc7180-trogdor-coachz-r2-lte.dts |  18 ++
 .../dts/qcom/sc7180-trogdor-coachz-r2.dts     |  15 +
 .../boot/dts/qcom/sc7180-trogdor-coachz.dtsi  | 240 +++++++++++++++
 .../sc7180-trogdor-lazor-limozeen-nots-r4.dts |  34 +++
 .../sc7180-trogdor-lazor-limozeen-nots.dts    |  26 ++
 .../qcom/sc7180-trogdor-lazor-limozeen.dts    |  42 +++
 .../dts/qcom/sc7180-trogdor-lazor-r3-kb.dts   |   5 +-
 .../dts/qcom/sc7180-trogdor-lazor-r3-lte.dts  |   4 +-
 .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts |   1 +
 .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi   |  39 +--
 .../dts/qcom/sc7180-trogdor-pompom-r1-lte.dts |  14 +
 .../dts/qcom/sc7180-trogdor-pompom-r1.dts     |  26 ++
 .../dts/qcom/sc7180-trogdor-pompom-r2-lte.dts |  14 +
 .../dts/qcom/sc7180-trogdor-pompom-r2.dts     |  44 +++
 .../boot/dts/qcom/sc7180-trogdor-pompom.dtsi  | 288 ++++++++++++++++++
 .../arm64/boot/dts/qcom/sc7180-trogdor-r1.dts |  35 ++-
 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi  | 105 +++----
 arch/arm64/boot/dts/qcom/sc7180.dtsi          |  41 +--
 21 files changed, 1064 insertions(+), 110 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2-lte.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog
#1 lore raw

PATCH v2 1/13 arm64: dts: qcom: sc7180: Update dts for DP phy inside QMP phy

From: Stephen Boyd <[email protected]>

Drop the old node and add the new one in its place.

Cc Stephen Boyd <[email protected]>
Cc Jeykumar Sankaran <[email protected]>
Cc Chandan Uddaraju <[email protected]>
Cc Vara Reddy <[email protected]>
Cc Tanmay Shah <[email protected]>
Cc Rob Clark <[email protected]>
[dianders: Adjusted due to DP not itself not in upstream dts yet]

---

(no changes since v1)

 arch/arm64/boot/dts/qcom/sc7180.dtsi | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)
arch/arm64/boot/dts/qcom/sc7180.dtsi +16 -7
index 1ea3344ab62c..60248a6757d8 100644
@@ -2770,12 +2770,11 @@ usb_1_hsphy: phy@88e3000 {
 		};
 
 		usb_1_qmpphy: phy-wrapper@88e9000 {
-			compatible = "qcom,sc7180-qmp-usb3-phy";
+			compatible = "qcom,sc7180-qmp-usb3-dp-phy";
 			reg = <0 0x088e9000 0 0x18c>,
-			      <0 0x088e8000 0 0x38>;
-			reg-names = "reg-base", "dp_com";
+			      <0 0x088e8000 0 0x38>,
+			      <0 0x088ea000 0 0x40>;
 			status = "disabled";
-			#clock-cells = <1>;
 			#address-cells = <2>;
 			#size-cells = <2>;
 			ranges;
@@ -2790,7 +2789,7 @@ usb_1_qmpphy: phy-wrapper@88e9000 {
 				 <&gcc GCC_USB3_DP_PHY_PRIM_BCR>;
 			reset-names = "phy", "common";
 
-			usb_1_ssphy: phy@88e9200 {
+			usb_1_ssphy: usb3-phy@88e9200 {
 				reg = <0 0x088e9200 0 0x128>,
 				      <0 0x088e9400 0 0x200>,
 				      <0 0x088e9c00 0 0x218>,
@@ -2803,6 +2802,16 @@ usb_1_ssphy: phy@88e9200 {
 				clock-names = "pipe0";
 				clock-output-names = "usb3_phy_pipe_clk_src";
 			};
+
+			dp_phy: dp-phy@88ea200 {
+				reg = <0 0x088ea200 0 0x200>,
+				      <0 0x088ea400 0 0x200>,
+				      <0 0x088eaa00 0 0x200>,
+				      <0 0x088ea600 0 0x200>,
+				      <0 0x088ea800 0 0x200>;
+				#clock-cells = <1>;
+				#phy-cells = <0>;
+			};
 		};
 
 		dc_noc: interconnect@9160000 {
@@ -3166,8 +3175,8 @@ dispcc: clock-controller@af00000 {
 				 <&gcc GCC_DISP_GPLL0_CLK_SRC>,
 				 <&dsi_phy 0>,
 				 <&dsi_phy 1>,
-				 <0>,
-				 <0>;
+				 <&dp_phy 0>,
+				 <&dp_phy 1>;
 			clock-names = "bi_tcxo",
 				      "gcc_disp_gpll0_clk_src",
 				      "dsi0_phy_pll_out_byteclk",
Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog
#2 lore raw

PATCH v2 2/13 arm64: dts: qcom: Move sc7180 MI2S config to board files and make pulldown

In reply to Douglas Anderson

In general pinconf belongs in board files, not SoC files. Move it to the only current user (trogdor). Also adjust the drive strengths and pulls.

Cc V Sujith Kumar Reddy <[email protected]>
Cc Srinivasa Rao Mandadapu <[email protected]>
Cc Tzung-Bi Shih <[email protected]>
Cc Judy Hsiao <[email protected]>

---
This should replace the patch ("Asoc: qcom: dts: Change MI2S GPIO configuration to pulldown") [1].

It can also be noted that on future SoCs we won't have the separate pinconf/pinmux nodes but we're not there yet on sc7180 [2].

[1] https://lore.kernel.org/r/[email protected]
[2] https://lore.kernel.org/r/CAD=FV=WhjvqUau_Jz9ZLFukGUxRqGJTJN+sUt=yv2Q81FRzUWQ@mail.gmail.com

(no changes since v1)

 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 24 ++++++++++++++++++++
 arch/arm64/boot/dts/qcom/sc7180.dtsi         | 18 ---------------
 2 files changed, 24 insertions(+), 18 deletions(-)
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +24 -0
index 58e127b6ba1e..47eed134c733 100644
@@ -877,6 +877,22 @@ pinconf {
 	};
 };
 
+&pri_mi2s_active {
+	pinconf {
+		pins = "gpio53", "gpio54", "gpio55", "gpio56";
+		drive-strength = <2>;
+		bias-pull-down;
+	};
+};
+
+&pri_mi2s_mclk_active {
+	pinconf {
+		pins = "gpio57";
+		drive-strength = <2>;
+		bias-pull-down;
+	};
+};
+
 &qspi_cs0 {
 	pinconf {
 		pins = "gpio68";
@@ -1017,6 +1033,14 @@ pinconf-rx {
 	};
 };
 
+&sec_mi2s_active {
+	pinconf {
+		pins = "gpio49", "gpio50", "gpio51";
+		drive-strength = <2>;
+		bias-pull-down;
+	};
+};
+
 /* PINCTRL - board-specific pinctrl */
 
 &pm6150_gpio {
arch/arm64/boot/dts/qcom/sc7180.dtsi +0 -18
index 60248a6757d8..5040923a9f7c 100644
@@ -1856,12 +1856,6 @@ pinmux {
 					pins = "gpio49", "gpio50", "gpio51";
 					function = "mi2s_1";
 				};
-
-				pinconf {
-					pins = "gpio49", "gpio50", "gpio51";
-					drive-strength = <8>;
-					bias-pull-up;
-				};
 			};
 
 			pri_mi2s_active: pri-mi2s-active {
@@ -1869,12 +1863,6 @@ pinmux {
 					pins = "gpio53", "gpio54", "gpio55", "gpio56";
 					function = "mi2s_0";
 				};
-
-				pinconf {
-					pins = "gpio53", "gpio54", "gpio55", "gpio56";
-					drive-strength = <8>;
-					bias-pull-up;
-				};
 			};
 
 			pri_mi2s_mclk_active: pri-mi2s-mclk-active {
@@ -1882,12 +1870,6 @@ pinmux {
 					pins = "gpio57";
 					function = "lpass_ext";
 				};
-
-				pinconf {
-					pins = "gpio57";
-					drive-strength = <8>;
-					bias-pull-up;
-				};
 			};
 
 			sdc1_on: sdc1-on {
Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog
Reviewed-by on v2 2/13
#3 lore raw

Re: [PATCH v2 02/13] arm64: dts: qcom: Move sc7180 MI2S config to board files and make pulldown

Quoting Douglas Anderson (2021-03-01 13:34:26)

Quoted 11 lines

In general pinconf belongs in board files, not SoC files. Move it to the only current user (trogdor). Also adjust the drive strengths and pulls.

Cc V Sujith Kumar Reddy <[email protected]>
Cc Srinivasa Rao Mandadapu <[email protected]>
Cc Tzung-Bi Shih <[email protected]>
Cc Judy Hsiao <[email protected]>

---

#4 lore raw

PATCH v2 3/13 arm64: dts: qcom: Prep sc7180-trogdor trackpad IRQ for new boards

In reply to Douglas Anderson

The trackpad interrupt got renamed and also moved to a new GPIO on newer boards. Let's do the move in the "trogdor.dtsi" file and then undo it in the two old boards.

NOTE: since none of the new boards have device trees yet, this change looks silly on its own but it will make sense after more boards are supported.

---

(no changes since v1)

 .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi      | 14 ++++++++++++++
 arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts   | 16 ++++++++++++++++
 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi     | 14 ++++++++------
 3 files changed, 38 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +14 -0
index 89e5cd29ec09..11269522da50 100644
@@ -58,8 +58,22 @@ ap_ts: touchscreen@10 {
 	};
 };
 
+&trackpad {
+	interrupts = <58 IRQ_TYPE_EDGE_FALLING>;
+};
+
 /* PINCTRL - modifications to sc7180-trogdor.dtsi */
 
+&trackpad_int_1v8_odl {
+	pinmux {
+		pins = "gpio58";
+	};
+
+	pinconf {
+		pins = "gpio58";
+	};
+};
+
 &ts_reset_l {
 	pinconf {
 		/* This pin is not connected on -rev0, pull up to park. */
arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts +16 -0
index 2cb522d6962e..bd2c783e0f2f 100644
@@ -68,6 +68,22 @@ &sdhc_2 {
 	status = "okay";
 };
 
+&trackpad {
+	interrupts = <58 IRQ_TYPE_EDGE_FALLING>;
+};
+
+/* PINCTRL - modifications to sc7180-trogdor.dtsi */
+
+&trackpad_int_1v8_odl {
+	pinmux {
+		pins = "gpio58";
+	};
+
+	pinconf {
+		pins = "gpio58";
+	};
+};
+
 /* PINCTRL - board-specific pinctrl */
 
 &tlmm {
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +8 -6
index 47eed134c733..b471503e415e 100644
@@ -644,14 +644,14 @@ ap_tp_i2c: &i2c7 {
 	status = "okay";
 	clock-frequency = <400000>;
 
-	trackpad@15 {
+	trackpad: trackpad@15 {
 		compatible = "elan,ekth3000";
 		reg = <0x15>;
 		pinctrl-names = "default";
-		pinctrl-0 = <&trackpad_int_1v8_odl>;
+		pinctrl-0 = <&tp_int_odl>;
 
 		interrupt-parent = <&tlmm>;
-		interrupts = <58 IRQ_TYPE_EDGE_FALLING>;
+		interrupts = <0 IRQ_TYPE_EDGE_FALLING>;
 
 		vcc-supply = <&pp3300_fp_tp>;
 
@@ -1412,14 +1412,16 @@ pinconf-rx {
 		};
 	};
 
-	trackpad_int_1v8_odl: trackpad-int-1v8-odl {
+	/* Named trackpad_int_1v8_odl on earlier revision schematics */
+	trackpad_int_1v8_odl:
+	tp_int_odl: tp-int-odl {
 		pinmux {
-			pins = "gpio58";
+			pins = "gpio0";
 			function = "gpio";
 		};
 
 		pinconf {
-			pins = "gpio58";
+			pins = "gpio0";
 
 			/* Has external pullup */
 			bias-disable;
Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog
Reviewed-by on v2 3/13
#5 lore raw

Re: [PATCH v2 03/13] arm64: dts: qcom: Prep sc7180-trogdor trackpad IRQ for new boards

Quoting Douglas Anderson (2021-03-01 13:34:27)

Quoted 11 lines

The trackpad interrupt got renamed and also moved to a new GPIO on newer boards. Let's do the move in the "trogdor.dtsi" file and then undo it in the two old boards.

NOTE: since none of the new boards have device trees yet, this change looks silly on its own but it will make sense after more boards are supported.

---

#6 lore raw

PATCH v2 4/13 arm64: dts: qcom: Unify the sc7180-trogdor panel nodes

In reply to Douglas Anderson

Let's avoid a bit of duplication by pushing this up to the trogdor.dtsi file.

---

(no changes since v1)

 .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi   | 21 ++++---------------
 .../arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 19 ++++-------------
 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi  | 15 +++++++++++++
 3 files changed, 23 insertions(+), 32 deletions(-)
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +4 -17
index 11269522da50..5efa04d0d256 100644
@@ -12,23 +12,6 @@
 
 #include "sc7180-trogdor.dtsi"
 
-/ {
-	panel: panel {
-		compatible = "boe,nv133fhm-n62";
-		power-supply = <&pp3300_dx_edp>;
-		backlight = <&backlight>;
-		hpd-gpios = <&sn65dsi86_bridge 2 GPIO_ACTIVE_HIGH>;
-
-		ports {
-			port {
-				panel_in_edp: endpoint {
-					remote-endpoint = <&sn65dsi86_out>;
-				};
-			};
-		};
-	};
-};
-
 &ap_sar_sensor {
 	semtech,cs0-ground;
 	semtech,combined-sensors = <3>;
@@ -58,6 +41,10 @@ ap_ts: touchscreen@10 {
 	};
 };
 
+&panel {
+	compatible = "boe,nv133fhm-n62";
+};
+
 &trackpad {
 	interrupts = <58 IRQ_TYPE_EDGE_FALLING>;
 };
arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts +4 -15
index bd2c783e0f2f..2b522f9e0d8f 100644
@@ -17,21 +17,6 @@
 / {
 	model = "Google Trogdor (rev1+)";
 	compatible = "google,trogdor", "qcom,sc7180";
-
-	panel: panel {
-		compatible = "auo,b116xa01";
-		power-supply = <&pp3300_dx_edp>;
-		backlight = <&backlight>;
-		hpd-gpios = <&sn65dsi86_bridge 2 GPIO_ACTIVE_HIGH>;
-
-		ports {
-			port {
-				panel_in_edp: endpoint {
-					remote-endpoint = <&sn65dsi86_out>;
-				};
-			};
-		};
-	};
 };
 
 ap_ts_pen_1v8: &i2c4 {
@@ -53,6 +38,10 @@ ap_ts: touchscreen@10 {
 	};
 };
 
+&panel {
+	compatible = "auo,b116xa01";
+};
+
 &pp3300_hub {
 	/* pp3300_l7c is used to power the USB hub */
 	/delete-property/regulator-always-on;
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +15 -0
index b471503e415e..7341fe6e2c0b 100644
@@ -257,6 +257,21 @@ max98357a: audio-codec-0 {
 		#sound-dai-cells = <0>;
 	};
 
+	panel: panel {
+		/* Compatible will be filled in per-board */
+		power-supply = <&pp3300_dx_edp>;
+		backlight = <&backlight>;
+		hpd-gpios = <&sn65dsi86_bridge 2 GPIO_ACTIVE_HIGH>;
+
+		ports {
+			port {
+				panel_in_edp: endpoint {
+					remote-endpoint = <&sn65dsi86_out>;
+				};
+			};
+		};
+	};
+
 	pwmleds {
 		compatible = "pwm-leds";
 		keyboard_backlight: keyboard-backlight {
Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog
#8 lore raw

PATCH v2 5/13 arm64: dts: qcom: trogdor: Only wakeup from pen eject

In reply to Douglas Anderson

From: Stephen Boyd <[email protected]>

Configure the pen to be a wakeup source only when the pen is ejected instead of both when the pen is ejected and inserted. This corresponds to wake source requirements.

---

(no changes since v1)

 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +2 -0
index 7341fe6e2c0b..2e5e3a8f210a 100644
@@ -6,6 +6,7 @@
  */
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/gpio-keys.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 
@@ -245,6 +246,7 @@ pen_insert: pen-insert {
 			gpios = <&tlmm 52 GPIO_ACTIVE_LOW>;
 			linux,code = <SW_PEN_INSERTED>;
 			linux,input-type = <EV_SW>;
+			wakeup-event-action = <EV_ACT_DEASSERTED>;
 			wakeup-source;
 		};
 	};
Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog
#9 lore raw

PATCH v2 6/13 arm64: dts: qcom: Disable camera clk on sc7180-trogdor devices by default

In reply to Douglas Anderson

From: Stephen Boyd <[email protected]>

We only want to use this clk driver on CoachZ devices. Disable it for all other Trogdor boards. NOTE: CoachZ devices aren't yet supported upstream so until it is this is just disabled for all trogdor.

Cc Tomasz Figa <[email protected]>
[dianders:adjusted since no coachz upstream yet]

---

(no changes since v1)

 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +4 -0
index 2e5e3a8f210a..8ae9606351a6 100644
@@ -570,6 +570,10 @@ cr50: tpm@0 {
 	};
 };
 
+&camcc {
+	status = "disabled";
+};
+
 &dsi0 {
 	status = "okay";
 	vdda-supply = <&vdda_mipi_dsi0_1p2>;
Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog
#10 lore raw

PATCH v2 7/13 arm64: dts: qcom: sc7180-trogdor: Remove fp control pins in prep for coachz

In reply to Douglas Anderson

From: Alexandru M Stan <[email protected]>

Removed the pinctrl and pin{mux,conf} for the control pins because:
1. The only need for them is for userspace control via flash_fp_mcu
2. cros-ec doesn't know what to do with them, and even if it did, it would interfere with flash_fp_mcu at the most inopportune times

Since we're not using hogs, we rely on AP firmware to set all the control pins correctly.

Cc Stephen Boyd <[email protected]>
Cc Craig Hesling <[email protected]>
[dianders: adjusted since coachz isn't upstream yet]

Reviewed-by; Matthias Kaehlcke <[email protected]>

---

(no changes since v1)

 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 45 +-------------------
 1 file changed, 1 insertion(+), 44 deletions(-)
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +1 -44
index 8ae9606351a6..c44be536b288 100644
@@ -810,7 +810,7 @@ cros_ec_fp: ec@0 {
 		interrupt-parent = <&tlmm>;
 		interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
 		pinctrl-names = "default";
-		pinctrl-0 = <&fp_to_ap_irq_l>, <&fp_rst_l>, <&fpmcu_boot0>, <&fpmcu_sel>;
+		pinctrl-0 = <&fp_to_ap_irq_l>;
 		spi-max-frequency = <3000000>;
 	};
 };
@@ -1235,48 +1235,6 @@ pinconf {
 		};
 	};
 
-	fpmcu_boot0: fpmcu-boot0 {
-		pinmux {
-			pins = "gpio10";
-			function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio10";
-			bias-disable;
-			drive-strength = <2>;
-			output-low;
-		};
-	};
-
-	fpmcu_sel: fpmcu-sel {
-		pinmux {
-			pins = "gpio22";
-			function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio22";
-			bias-disable;
-			drive-strength = <2>;
-			output-high;
-		};
-	};
-
-	fp_rst_l: fp-rst-l {
-		pinmux {
-			pins = "gpio5";
-			function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio5";
-			bias-disable;
-			drive-strength = <2>;
-			output-high;
-		};
-	};
-
 	fp_to_ap_irq_l: fp-to-ap-irq-l {
 		pinmux {
 			pins = "gpio4";
@@ -1292,7 +1250,6 @@ pinconf {
 		};
 	};
 
-
 	h1_ap_int_odl: h1-ap-int-odl {
 		pinmux {
 			pins = "gpio42";
Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog
Reviewed-by on v2 7/13
#11 lore raw

Re: [PATCH v2 07/13] arm64: dts: qcom: sc7180-trogdor: Remove fp control pins in prep for coachz

Quoting Douglas Anderson (2021-03-01 13:34:31)

Quoted 10 lines

From: Alexandru M Stan <[email protected]>

Removed the pinctrl and pin{mux,conf} for the control pins because:
1. The only need for them is for userspace control via flash_fp_mcu
2. cros-ec doesn't know what to do with them, and even if it did, it would interfere with flash_fp_mcu at the most inopportune times

Since we're not using hogs, we rely on AP firmware to set all the control pins correctly.

Quoted 7 lines
Cc Stephen Boyd <[email protected]>
Cc Craig Hesling <[email protected]>
[dianders: adjusted since coachz isn't upstream yet]

Reviewed-by; Matthias Kaehlcke <[email protected]>

---

#12 lore raw

PATCH v2 8/13 arm64: dts: qcom: sc7180: Remove clock for bluetooth on Trogdor

In reply to Douglas Anderson

From: Venkata Lakshmi Narayana Gubba <[email protected]>

Removed voting for RPMH_RF_CLK2 which is not required as it is getting managed by BT SoC through SW_CTRL line.

---

(no changes since v1)

 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 -
 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +0 -1
index c44be536b288..aa0efc42d5ea 100644
@@ -835,7 +835,6 @@ bluetooth: bluetooth {
 		vddrf-supply = <&pp1300_l2c>;
 		vddch0-supply = <&pp3300_l10c>;
 		max-speed = <3200000>;
-		clocks = <&rpmhcc RPMH_RF_CLK2>;
 	};
 };
 
Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog
Reviewed-by on v2 8/13
#13 lore raw

Re: [PATCH v2 08/13] arm64: dts: qcom: sc7180: Remove clock for bluetooth on Trogdor

Quoting Douglas Anderson (2021-03-01 13:34:32)

Quoted 10 lines

From: Venkata Lakshmi Narayana Gubba <[email protected]>

Removed voting for RPMH_RF_CLK2 which is not required as it is getting managed by BT SoC through SW_CTRL line.

---

#14 lore raw

PATCH v2 9/13 arm64: dts: qcom: sc7180: add GO_LAZOR variant property for lazor

In reply to Douglas Anderson

From: Abhishek Kumar <[email protected]>

For trogdor, in the latest board-2.bin file, new BDF with variant name GO_LAZOR has been introduced, so we need this property set, for GO_LAZOR BDF to be picked.

Cc Philip Chen <[email protected]>
[dianders: adjusted subject line and sort order]

---

(no changes since v1)

 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +4 -0
index 5efa04d0d256..6b10b96173e8 100644
@@ -49,6 +49,10 @@ &trackpad {
 	interrupts = <58 IRQ_TYPE_EDGE_FALLING>;
 };
 
+&wifi {
+	qcom,ath10k-calibration-variant = "GO_LAZOR";
+};
+
 /* PINCTRL - modifications to sc7180-trogdor.dtsi */
 
 &trackpad_int_1v8_odl {
Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog
Reviewed-by on v2 9/13
#15 lore raw

Re: [PATCH v2 09/13] arm64: dts: qcom: sc7180: add GO_LAZOR variant property for lazor

Quoting Douglas Anderson (2021-03-01 13:34:33)

Quoted 6 lines

From: Abhishek Kumar <[email protected]>

For trogdor, in the latest board-2.bin file, new BDF with variant name GO_LAZOR has been introduced, so we need this property set, for GO_LAZOR BDF to be picked.

Quoted 6 lines
Cc Philip Chen <[email protected]>
[dianders: adjusted subject line and sort order]

---

#16 lore raw

PATCH v2 10/13 arm64: dts: qcom: sc7180: Set up lazor r3+ as sc7180-lite SKUs

In reply to Douglas Anderson

From: Matthias Kaehlcke <[email protected]>

Lazor rev3 and later use the 'lite' version of the SC7180 SoC.

Cc Stephen Boyd <[email protected]>
[dianders: Adjust commit message which referred to downstream history]

---

(no changes since v1)

 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts  | 5 ++++-
 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 4 +++-
 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts     | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts +4 -1
index 6985beb97e53..dcb41afdc82a 100644
@@ -5,7 +5,10 @@
  * Copyright 2020 Google LLC.
  */
 
-#include "sc7180-trogdor-lazor-r3.dts"
+/dts-v1/;
+
+#include "sc7180-trogdor-lazor.dtsi"
+#include "sc7180-lite.dtsi"
 
 / {
 	model = "Google Lazor (rev3+) with KB Backlight";
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts +3 -1
index 0881f8dd02c9..be44900602d7 100644
@@ -5,7 +5,9 @@
  * Copyright 2020 Google LLC.
  */
 
-#include "sc7180-trogdor-lazor-r3.dts"
+/dts-v1/;
+
+#include "sc7180-trogdor-lazor.dtsi"
 #include "sc7180-trogdor-lte-sku.dtsi"
 
 / {
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts +1 -0
index 19e69adb9e04..ea8c2ee09741 100644
@@ -8,6 +8,7 @@
 /dts-v1/;
 
 #include "sc7180-trogdor-lazor.dtsi"
+#include "sc7180-lite.dtsi"
 
 / {
 	model = "Google Lazor (rev3+)";
Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog
Reviewed-by on v2 10/13
#17 lore raw

Re: [PATCH v2 10/13] arm64: dts: qcom: sc7180: Set up lazor r3+ as sc7180-lite SKUs

Quoting Douglas Anderson (2021-03-01 13:34:34)

Quoted 9 lines

From: Matthias Kaehlcke <[email protected]>

Lazor rev3 and later use the 'lite' version of the SC7180 SoC.

Cc Stephen Boyd <[email protected]>
[dianders: Adjust commit message which referred to downstream history]

---

#18 lore raw

PATCH v2 11/13 arm64: dts: qcom: Add sc7180-lazor-limozeen skus

In reply to Douglas Anderson

This is a SKU variant of lazor. Add it. This squashes the downstream patches to support this hardware.

NOTES:
- The non-touch SKU actually has "innolux,n116bca-ea1" but that driver is still pending in simple-panel. The bindings have been Acked though [1]. Things work well enough with the "innolux,n116bge" timings for now, though.
- The wonky special dts just for "-rev4" arguably doesn't need to go upstream since they weren't widely distributed, but since a few people have them we might as well. If it ever causes problems we can delete it.

[1] https://lore.kernel.org/r/20210115144345.v2.4.I6889e21811df6adaff5c5b8a8c80fda0669ab3a5@changeid

---

Changes in v2:
- Add link to Acked bindings.
- Proper compatible for the "correct" panel (added -ea1 suffix).

 arch/arm64/boot/dts/qcom/Makefile             |  3 ++
 .../sc7180-trogdor-lazor-limozeen-nots-r4.dts | 34 +++++++++++++++
 .../sc7180-trogdor-lazor-limozeen-nots.dts    | 26 ++++++++++++
 .../qcom/sc7180-trogdor-lazor-limozeen.dts    | 42 +++++++++++++++++++
 4 files changed, 105 insertions(+)
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts
arch/arm64/boot/dts/qcom/Makefile +3 -0
index 549a7a2151d4..adc915a5f027 100644
@@ -38,6 +38,9 @@ dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r1-lte.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r3.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r3-kb.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r3-lte.dtb
+dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-limozeen.dtb
+dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-limozeen-nots.dtb
+dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-limozeen-nots-r4.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-r1.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-r1-lte.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm630-sony-xperia-ganges-kirin.dtb
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts new file +34 -0
new file mode 100644
index 000000000000..6ebde0828550
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Lazor Limozeen board device tree source
+ *
+ * Copyright 2020 Google LLC.
+ */
+
+#include "sc7180-trogdor-lazor-limozeen-nots.dts"
+
+/ {
+	model = "Google Lazor Limozeen without Touchscreen (rev4)";
+	compatible = "google,lazor-rev4-sku5", "qcom,sc7180";
+};
+
+/*
+ * rev4-sku5 was built with a different trackpad.
+ */
+/delete-node/&trackpad;
+&ap_tp_i2c {
+	 trackpad: trackpad@2c {
+		compatible = "hid-over-i2c";
+		reg = <0x2c>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&tp_int_odl>;
+
+		interrupt-parent = <&tlmm>;
+		interrupts = <58 IRQ_TYPE_EDGE_FALLING>;
+
+		vcc-supply = <&pp3300_fp_tp>;
+		hid-descr-addr = <0x20>;
+
+		wakeup-source;
+	};
+};
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts new file +26 -0
new file mode 100644
index 000000000000..0456c7e05d00
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Lazor Limozeen board device tree source
+ *
+ * Copyright 2020 Google LLC.
+ */
+
+/dts-v1/;
+
+#include "sc7180-trogdor-lazor.dtsi"
+#include "sc7180-trogdor-lte-sku.dtsi"
+
+/ {
+	model = "Google Lazor Limozeen without Touchscreen";
+	compatible = "google,lazor-sku6", "google,lazor-sku5", "qcom,sc7180";
+};
+
+/delete-node/&ap_ts;
+
+&panel {
+	compatible = "innolux,n116bca-ea1", "innolux,n116bge";
+};
+
+&sdhc_2 {
+	status = "okay";
+};
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts new file +42 -0

42 lines not on this page · raw message

Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog
Reviewed-by on v2 11/13
#19 lore raw

Re: [PATCH v2 11/13] arm64: dts: qcom: Add sc7180-lazor-limozeen skus

Quoting Douglas Anderson (2021-03-01 13:34:35)

Quoted 13 lines

This is a SKU variant of lazor. Add it. This squashes the downstream patches to support this hardware.

NOTES:
- The non-touch SKU actually has "innolux,n116bca-ea1" but that driver is still pending in simple-panel. The bindings have been Acked though [1]. Things work well enough with the "innolux,n116bge" timings for now, though.
- The wonky special dts just for "-rev4" arguably doesn't need to go upstream since they weren't widely distributed, but since a few people have them we might as well. If it ever causes problems we can delete it.

Quoted 6 lines

[1] https://lore.kernel.org/r/20210115144345.v2.4.I6889e21811df6adaff5c5b8a8c80fda0669ab3a5@changeid

---

#20 lore raw

PATCH v2 12/13 arm64: dts: qcom: Add sc7180-trogdor-pompom skus

In reply to Douglas Anderson

This is a trogdor variant. This is mostly a grab from the downstream tree with notable exceptions:
- I skip -rev0. This was a super early build and there's no advantage of long term support.
- In -rev1 I translate the handling of the USB hub like is done for similar boards. See the difference between the downstream and upstream 'sc7180-trogdor-lazor-r0.dts' for an example. This will need to be resolved when proper support for the USB hub is figured out upstream.
- I remove sound node since sound hasn't landed upstream yet.
- In incorporate the pending <https://crrev.com/c/2719075> for the keyboard.

Cc Philip Chen <[email protected]>
Cc Matthias Kaehlcke <[email protected]>
Cc Stephen Boyd <[email protected]>
Cc Tzung-Bi Shih <[email protected]>
Cc Judy Hsiao <[email protected]>

---

Changes in v2:
- Rebase atop commit 7822de1a2946 ("arm64:...1 for charger temperature")
- lazor => trogdor in subject

 arch/arm64/boot/dts/qcom/Makefile             |   4 +
 .../dts/qcom/sc7180-trogdor-pompom-r1-lte.dts |  14 +
 .../dts/qcom/sc7180-trogdor-pompom-r1.dts     |  26 ++
 .../dts/qcom/sc7180-trogdor-pompom-r2-lte.dts |  14 +
 .../dts/qcom/sc7180-trogdor-pompom-r2.dts     |  44 +++
 .../boot/dts/qcom/sc7180-trogdor-pompom.dtsi  | 288 ++++++++++++++++++
 6 files changed, 390 insertions(+)
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
arch/arm64/boot/dts/qcom/Makefile +4 -0
index adc915a5f027..d7cdff3dad98 100644
@@ -41,6 +41,10 @@ dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r3-lte.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-limozeen.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-limozeen-nots.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-limozeen-nots-r4.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
+dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-pompom-r2-lte.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-r1.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-r1-lte.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm630-sony-xperia-ganges-kirin.dtb
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts new file +14 -0
new file mode 100644
index 000000000000..0202f03eafe6
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Pompom board device tree source
+ *
+ * Copyright 2020 Google LLC.
+ */
+
+#include "sc7180-trogdor-pompom-r1.dts"
+#include "sc7180-trogdor-lte-sku.dtsi"
+
+/ {
+	model = "Google Pompom (rev1) with LTE";
+	compatible = "google,pompom-rev1-sku0", "qcom,sc7180";
+};
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts new file +26 -0
new file mode 100644
index 000000000000..e720e7bd0d70
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Pompom board device tree source
+ *
+ * Copyright 2020 Google LLC.
+ */
+
+/dts-v1/;
+
+#include "sc7180-trogdor-pompom.dtsi"
+
+/ {
+	model = "Google Pompom (rev1)";
+	compatible = "google,pompom-rev1", "qcom,sc7180";
+};
+
+&pp3300_hub {
+	/* pp3300_l7c is used to power the USB hub */
+	/delete-property/regulator-always-on;
+	/delete-property/regulator-boot-on;
+};
+
+&pp3300_l7c {
+	regulator-always-on;
+	regulator-boot-on;
+};
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts new file +14 -0
new file mode 100644
index 000000000000..791d496ad046
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Pompom board device tree source
+ *
+ * Copyright 2020 Google LLC.
+ */
+
+#include "sc7180-trogdor-pompom-r2.dts"
+#include "sc7180-trogdor-lte-sku.dtsi"
+
+/ {
+	model = "Google Pompom (rev2+) with LTE";
+	compatible = "google,pompom-sku0", "qcom,sc7180";
+};
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts new file +44 -0

44 lines not on this page · raw message

arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi new file +288 -0

288 lines not on this page · raw message

Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog
Reviewed-by on v2 12/13
#21 lore raw

Re: [PATCH v2 12/13] arm64: dts: qcom: Add sc7180-trogdor-pompom skus

Quoting Douglas Anderson (2021-03-01 13:34:36)

Quoted 13 lines

This is a trogdor variant. This is mostly a grab from the downstream tree with notable exceptions:
- I skip -rev0. This was a super early build and there's no advantage of long term support.
- In -rev1 I translate the handling of the USB hub like is done for similar boards. See the difference between the downstream and upstream 'sc7180-trogdor-lazor-r0.dts' for an example. This will need to be resolved when proper support for the USB hub is figured out upstream.
- I remove sound node since sound hasn't landed upstream yet.
- In incorporate the pending <https://crrev.com/c/2719075> for the keyboard.

Quoted 8 lines
Cc Philip Chen <[email protected]>
Cc Matthias Kaehlcke <[email protected]>
Cc Stephen Boyd <[email protected]>
Cc Tzung-Bi Shih <[email protected]>
Cc Judy Hsiao <[email protected]>

---

#22 lore raw

PATCH v2 13/13 arm64: dts: qcom: Add sc7180-trogdor-coachz skus

In reply to Douglas Anderson

This is a trogdor variant. This is mostly a grab from the downstream tree with notable exceptions:
- I skip -rev0. This was a super early build and there's no advantage of long term support.
- I remove sound node since sound hasn't landed upstream yet.

Cc Gwendal Grignou <[email protected]>
Cc Matthias Kaehlcke <[email protected]>
Cc Stephen Boyd <[email protected]>
Cc Tzung-Bi Shih <[email protected]>
Cc Judy Hsiao <[email protected]>

---
NOTE: technically the "google,cros-ec-mkbp-proximity" binding hasn't landed upstream yet. However it has a Reviewed-by from Rob and the series in general sounds about ready to land. If necessary it can be removed / readded later.

Changes in v2:
- Removed "i2c_wlc" as Stephen suggested.
- lazor => trogdor in subject

 arch/arm64/boot/dts/qcom/Makefile             |   4 +
 .../dts/qcom/sc7180-trogdor-coachz-r1-lte.dts |  18 ++
 .../dts/qcom/sc7180-trogdor-coachz-r1.dts     | 154 +++++++++++
 .../dts/qcom/sc7180-trogdor-coachz-r2-lte.dts |  18 ++
 .../dts/qcom/sc7180-trogdor-coachz-r2.dts     |  15 ++
 .../boot/dts/qcom/sc7180-trogdor-coachz.dtsi  | 240 ++++++++++++++++++
 6 files changed, 449 insertions(+)
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2-lte.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
arch/arm64/boot/dts/qcom/Makefile +4 -0
index d7cdff3dad98..a81966d59cf7 100644
@@ -31,6 +31,10 @@ dtb-$(CONFIG_ARCH_QCOM)	+= qcs404-evb-1000.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= qcs404-evb-4000.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= qrb5165-rb5.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-idp.dtb
+dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-coachz-r1.dtb
+dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-coachz-r1-lte.dtb
+dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-coachz-r2.dtb
+dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-coachz-r2-lte.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r0.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r1.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r1-kb.dtb
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts new file +18 -0
new file mode 100644
index 000000000000..533c048903ea
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google CoachZ board device tree source
+ *
+ * Copyright 2020 Google LLC.
+ */
+
+#include "sc7180-trogdor-coachz-r1.dts"
+#include "sc7180-trogdor-lte-sku.dtsi"
+
+/ {
+	model = "Google CoachZ (rev1) with LTE";
+	compatible = "google,coachz-rev1-sku0", "qcom,sc7180";
+};
+
+&cros_ec_proximity {
+	label = "proximity-wifi-lte";
+};
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts new file +154 -0

154 lines not on this page · raw message

arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2-lte.dts new file +18 -0
new file mode 100644
index 000000000000..6e7745801fae
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google CoachZ board device tree source
+ *
+ * Copyright 2020 Google LLC.
+ */
+
+#include "sc7180-trogdor-coachz-r2.dts"
+#include "sc7180-trogdor-lte-sku.dtsi"
+
+/ {
+	model = "Google CoachZ (rev2+) with LTE";
+	compatible = "google,coachz-sku0", "qcom,sc7180";
+};
+
+&cros_ec_proximity {
+	label = "proximity-wifi-lte";
+};
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2.dts new file +15 -0
new file mode 100644
index 000000000000..4f69b6ba299f
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google CoachZ board device tree source
+ *
+ * Copyright 2020 Google LLC.
+ */
+
+/dts-v1/;
+
+#include "sc7180-trogdor-coachz.dtsi"
+
+/ {
+	model = "Google CoachZ (rev2+)";
+	compatible = "google,coachz", "qcom,sc7180";
+};
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi new file +240 -0

240 lines not on this page · raw message

Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog
Reviewed-by on v2 13/13
#23 lore raw

Re: [PATCH v2 13/13] arm64: dts: qcom: Add sc7180-trogdor-coachz skus

Quoting Douglas Anderson (2021-03-01 13:34:37)

Quoted 6 lines

This is a trogdor variant. This is mostly a grab from the downstream tree with notable exceptions:
- I skip -rev0. This was a super early build and there's no advantage of long term support.
- I remove sound node since sound hasn't landed upstream yet.

Quoted 8 lines
Cc Gwendal Grignou <[email protected]>
Cc Matthias Kaehlcke <[email protected]>
Cc Stephen Boyd <[email protected]>
Cc Tzung-Bi Shih <[email protected]>
Cc Judy Hsiao <[email protected]>

---

#24 lore raw
In reply to Douglas Anderson
This series was applied to qcom/linux.git (refs/heads/for-next):

Hello:

This series was applied to qcom/linux.git (refs/heads/for-next):

Quoted 8 lines · On Mon, 1 Mar 2021 13:34:24 -0800 you wrote:

The point of this series is to catch upstream up to what we have downstream in terms of sc7180-trogdor variants. Notably:
- It incorporates minor changes that snuck into the trogdor and lazor device tree files since they were posted upstream.
- It adds the "Limozeen" SKU variant of Lazor.
- It adds support the Pompom and CoachZ type trogdor boards.

[...]

Here is the summary with links:
- [v2,01/13] arm64: dts: qcom: sc7180: Update dts for DP phy inside QMP phy

    https://git.kernel.org/qcom/c/466952306ea6
  - [v2,02/13] arm64: dts: qcom: Move sc7180 MI2S config to board files and make pulldown
    https://git.kernel.org/qcom/c/64aefe7aaef7
  - [v2,03/13] arm64: dts: qcom: Prep sc7180-trogdor trackpad IRQ for new boards
    https://git.kernel.org/qcom/c/e1120b906c22
  - [v2,04/13] arm64: dts: qcom: Unify the sc7180-trogdor panel nodes
    https://git.kernel.org/qcom/c/bc6d6c2185de
  - [v2,05/13] arm64: dts: qcom: trogdor: Only wakeup from pen eject
    https://git.kernel.org/qcom/c/93d6bbdbafbf
  - [v2,06/13] arm64: dts: qcom: Disable camera clk on sc7180-trogdor devices by default
    https://git.kernel.org/qcom/c/1e7f50e04f18
  - [v2,07/13] arm64: dts: qcom: sc7180-trogdor: Remove fp control pins in prep for coachz
    https://git.kernel.org/qcom/c/db97900a0165
  - [v2,08/13] arm64: dts: qcom: sc7180: Remove clock for bluetooth on Trogdor
    https://git.kernel.org/qcom/c/6ba57fcce536
  - [v2,09/13] arm64: dts: qcom: sc7180: add GO_LAZOR variant property for lazor
    https://git.kernel.org/qcom/c/42f9a4a21ecb
  - [v2,10/13] arm64: dts: qcom: sc7180: Set up lazor r3+ as sc7180-lite SKUs
    https://git.kernel.org/qcom/c/ad40a8b8ebb2
  - [v2,11/13] arm64: dts: qcom: Add sc7180-lazor-limozeen skus
    https://git.kernel.org/qcom/c/08f08ce1932b
  - [v2,12/13] arm64: dts: qcom: Add sc7180-trogdor-pompom skus
    https://git.kernel.org/qcom/c/e218fbeb63e2
  - [v2,13/13] arm64: dts: qcom: Add sc7180-trogdor-coachz skus
    https://git.kernel.org/qcom/c/5cc369178b3a

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html