* [PATCH 1/3] dt-bindings: arm: qcom: add sc7180-lazor board bindings
2023-08-02 9:57 [PATCH 0/3] Add no-esim sku for sc7180-lazor family and new board version Sheng-Liang Pan
@ 2023-08-02 9:57 ` Sheng-Liang Pan
2023-08-02 20:53 ` Doug Anderson
2023-08-02 9:57 ` [PATCH 2/3] arm64: dts: qcom: Add sku_id for lazor/limozeen Sheng-Liang Pan
2023-08-02 9:57 ` [PATCH 3/3] arm64: dts: qcom: Add board id " Sheng-Liang Pan
2 siblings, 1 reply; 8+ messages in thread
From: Sheng-Liang Pan @ 2023-08-02 9:57 UTC (permalink / raw)
To: LKML
Cc: dianders, Sheng-Liang Pan, Andy Gross, Bjorn Andersson,
Conor Dooley, Konrad Dybcio, Krzysztof Kozlowski, Rob Herring,
devicetree, linux-arm-msm
Introduce more sc7180-lazor sku and board version configuration,
add no-eSIM SKU 10 for Lazor, no-eSIM SKU 15 and 18 for Limozeen,
add new board version 10 for audio codec ALC5682i-VS.
Signed-off-by: Sheng-Liang Pan <sheng-liang.pan@quanta.corp-partner.google.com>
---
.../devicetree/bindings/arm/qcom.yaml | 43 ++++++++++++++++---
1 file changed, 38 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml
index 450f616774e0..e0efc80a72e1 100644
--- a/Documentation/devicetree/bindings/arm/qcom.yaml
+++ b/Documentation/devicetree/bindings/arm/qcom.yaml
@@ -460,7 +460,7 @@ properties:
- const: google,lazor-rev2
- const: qcom,sc7180
- - description: Acer Chromebook Spin 513 (rev3 - 8)
+ - description: Acer Chromebook Spin 513 (rev3 - 9)
items:
- const: google,lazor-rev3
- const: google,lazor-rev4
@@ -468,6 +468,7 @@ properties:
- const: google,lazor-rev6
- const: google,lazor-rev7
- const: google,lazor-rev8
+ - const: google,lazor-rev9
- const: qcom,sc7180
- description: Acer Chromebook Spin 513 (newest rev)
@@ -481,7 +482,7 @@ properties:
- const: google,lazor-rev2-sku2
- const: qcom,sc7180
- - description: Acer Chromebook Spin 513 with KB Backlight (rev3 - 8)
+ - description: Acer Chromebook Spin 513 with KB Backlight (rev3 - 9)
items:
- const: google,lazor-rev3-sku2
- const: google,lazor-rev4-sku2
@@ -489,6 +490,7 @@ properties:
- const: google,lazor-rev6-sku2
- const: google,lazor-rev7-sku2
- const: google,lazor-rev8-sku2
+ - const: google,lazor-rev9-sku2
- const: qcom,sc7180
- description: Acer Chromebook Spin 513 with KB Backlight (newest rev)
@@ -502,7 +504,7 @@ properties:
- const: google,lazor-rev2-sku0
- const: qcom,sc7180
- - description: Acer Chromebook Spin 513 with LTE (rev3 - 8)
+ - description: Acer Chromebook Spin 513 with LTE (rev3 - 9)
items:
- const: google,lazor-rev3-sku0
- const: google,lazor-rev4-sku0
@@ -510,6 +512,7 @@ properties:
- const: google,lazor-rev6-sku0
- const: google,lazor-rev7-sku0
- const: google,lazor-rev8-sku0
+ - const: google,lazor-rev9-sku0
- const: qcom,sc7180
- description: Acer Chromebook Spin 513 with LTE (newest rev)
@@ -517,13 +520,24 @@ properties:
- const: google,lazor-sku0
- const: qcom,sc7180
- - description: Acer Chromebook 511 (rev4 - rev8)
+ - description: Acer Chromebook Spin 513 with LTE no-esim (rev9)
+ items:
+ - const: google,lazor-rev9-sku10
+ - const: qcom,sc7180
+
+ - description: Acer Chromebook Spin 513 with LTE no-esim (newest rev)
+ items:
+ - const: google,lazor-sku10
+ - const: qcom,sc7180
+
+ - description: Acer Chromebook 511 (rev4 - rev9)
items:
- const: google,lazor-rev4-sku4
- const: google,lazor-rev5-sku4
- const: google,lazor-rev6-sku4
- const: google,lazor-rev7-sku4
- const: google,lazor-rev8-sku4
+ - const: google,lazor-rev9-sku4
- const: qcom,sc7180
- description: Acer Chromebook 511 (newest rev)
@@ -536,13 +550,14 @@ properties:
- const: google,lazor-rev4-sku5
- const: qcom,sc7180
- - description: Acer Chromebook 511 without Touchscreen (rev5 - rev8)
+ - description: Acer Chromebook 511 without Touchscreen (rev5 - rev9)
items:
- const: google,lazor-rev5-sku5
- const: google,lazor-rev5-sku6
- const: google,lazor-rev6-sku6
- const: google,lazor-rev7-sku6
- const: google,lazor-rev8-sku6
+ - const: google,lazor-rev9-sku6
- const: qcom,sc7180
- description: Acer Chromebook 511 without Touchscreen (newest rev)
@@ -550,6 +565,24 @@ properties:
- const: google,lazor-sku6
- const: qcom,sc7180
+ - description: Acer Chromebook 511 no-esim (rev9)
+ items:
+ - const: google,lazor-rev9-sku15
+ - const: qcom,sc7180
+
+ - description: Acer Chromebook 511 no-esim(newest rev)
+ items:
+ - const: google,lazor-sku15
+
+ - description: Acer Chromebook 511 without Touchscreen no-esim (rev9)
+ items:
+ - const: google,lazor-rev9-sku18
+ - const: qcom,sc7180
+
+ - description: Acer Chromebook 511 without Touchscreen no-esim(newest rev)
+ items:
+ - const: google,lazor-sku18
+
- description: Google Mrbland with AUO panel (rev0)
items:
- const: google,mrbland-rev0-sku0
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 1/3] dt-bindings: arm: qcom: add sc7180-lazor board bindings
2023-08-02 9:57 ` [PATCH 1/3] dt-bindings: arm: qcom: add sc7180-lazor board bindings Sheng-Liang Pan
@ 2023-08-02 20:53 ` Doug Anderson
0 siblings, 0 replies; 8+ messages in thread
From: Doug Anderson @ 2023-08-02 20:53 UTC (permalink / raw)
To: Sheng-Liang Pan
Cc: LKML, Andy Gross, Bjorn Andersson, Conor Dooley, Konrad Dybcio,
Krzysztof Kozlowski, Rob Herring, devicetree, linux-arm-msm
Hi,
On Wed, Aug 2, 2023 at 2:58 AM Sheng-Liang Pan
<sheng-liang.pan@quanta.corp-partner.google.com> wrote:
>
> Introduce more sc7180-lazor sku and board version configuration,
> add no-eSIM SKU 10 for Lazor, no-eSIM SKU 15 and 18 for Limozeen,
> add new board version 10 for audio codec ALC5682i-VS.
>
> Signed-off-by: Sheng-Liang Pan <sheng-liang.pan@quanta.corp-partner.google.com>
> ---
>
> .../devicetree/bindings/arm/qcom.yaml | 43 ++++++++++++++++---
> 1 file changed, 38 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml
> index 450f616774e0..e0efc80a72e1 100644
> --- a/Documentation/devicetree/bindings/arm/qcom.yaml
> +++ b/Documentation/devicetree/bindings/arm/qcom.yaml
> @@ -460,7 +460,7 @@ properties:
> - const: google,lazor-rev2
> - const: qcom,sc7180
>
> - - description: Acer Chromebook Spin 513 (rev3 - 8)
> + - description: Acer Chromebook Spin 513 (rev3 - 9)
> items:
> - const: google,lazor-rev3
> - const: google,lazor-rev4
> @@ -468,6 +468,7 @@ properties:
> - const: google,lazor-rev6
> - const: google,lazor-rev7
> - const: google,lazor-rev8
> + - const: google,lazor-rev9
I don't think this is correct. lazor-rev9 has the Parade bridge chip,
not the TI bridge chip. It can't be lumped together with the earlier
revisions. What you want to do is leave the "rev3 - 8" alone, then add
a new entry just for "-rev9". Your brand new revision 10 doesn't need
its own entry in this list because it's the "newest rev".
> @@ -550,6 +565,24 @@ properties:
> - const: google,lazor-sku6
> - const: qcom,sc7180
>
> + - description: Acer Chromebook 511 no-esim (rev9)
> + items:
> + - const: google,lazor-rev9-sku15
> + - const: qcom,sc7180
> +
> + - description: Acer Chromebook 511 no-esim(newest rev)
nit: please put a space before "(newest rev)"
> + items:
> + - const: google,lazor-sku15
You're missing the second item: "const: qcom,sc7180"
> + - description: Acer Chromebook 511 without Touchscreen no-esim (rev9)
> + items:
> + - const: google,lazor-rev9-sku18
> + - const: qcom,sc7180
> +
> + - description: Acer Chromebook 511 without Touchscreen no-esim(newest rev)
nit: please put a space before "(newest rev)"
> + items:
> + - const: google,lazor-sku18
You're missing the second item: "const: qcom,sc7180"
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/3] arm64: dts: qcom: Add sku_id for lazor/limozeen
2023-08-02 9:57 [PATCH 0/3] Add no-esim sku for sc7180-lazor family and new board version Sheng-Liang Pan
2023-08-02 9:57 ` [PATCH 1/3] dt-bindings: arm: qcom: add sc7180-lazor board bindings Sheng-Liang Pan
@ 2023-08-02 9:57 ` Sheng-Liang Pan
2023-08-02 20:53 ` Doug Anderson
2023-08-02 9:57 ` [PATCH 3/3] arm64: dts: qcom: Add board id " Sheng-Liang Pan
2 siblings, 1 reply; 8+ messages in thread
From: Sheng-Liang Pan @ 2023-08-02 9:57 UTC (permalink / raw)
To: LKML
Cc: dianders, Sheng-Liang Pan, Andy Gross, Bjorn Andersson,
Conor Dooley, Konrad Dybcio, Krzysztof Kozlowski, Rob Herring,
cros-qcom-dts-watchers, devicetree, linux-arm-msm
SKU ID 10: Lazor LTE+Wifi, no-esim (Strapped 0 X 0)
SKU ID 15: Limozeen LTE+Wifi, TS, no esim (Strapped 1 X 0)
SKU ID 18: Limozeen LTE+Wifi, no TS, no esim (Strapped X 0 0)
Even though the "no esim" boards are strapped differently than
ones that have an esim, the esim isn't represented in the
device tree so the same device tree can be used for LTE w/ esim
and LTE w/out esim.
Signed-off-by: Sheng-Liang Pan <sheng-liang.pan@quanta.corp-partner.google.com>
---
.../boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
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 913b5fc3ba76..cef57c15b70b 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
@@ -14,7 +14,7 @@
/ {
model = "Google Lazor Limozeen without Touchscreen (rev9+)";
- compatible = "google,lazor-sku6", "qcom,sc7180";
+ compatible = "google,lazor-sku6", "google,lazor-sku18", "qcom,sc7180";
};
/delete-node/&ap_ts;
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 15d77dc5f956..2038a82bc0e7 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
@@ -14,7 +14,7 @@
/ {
model = "Google Lazor Limozeen (rev9+)";
- compatible = "google,lazor-sku4", "qcom,sc7180";
+ compatible = "google,lazor-sku4", "google,lazor-sku15", "qcom,sc7180";
};
/delete-node/&ap_ts;
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 38027f13b9d0..438ab9cd3389 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
@@ -14,7 +14,7 @@
/ {
model = "Google Lazor (rev9+) with LTE";
- compatible = "google,lazor-sku0", "qcom,sc7180";
+ compatible = "google,lazor-sku0", "google,lazor-sku10", "qcom,sc7180";
};
&ap_sar_sensor_i2c {
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 2/3] arm64: dts: qcom: Add sku_id for lazor/limozeen
2023-08-02 9:57 ` [PATCH 2/3] arm64: dts: qcom: Add sku_id for lazor/limozeen Sheng-Liang Pan
@ 2023-08-02 20:53 ` Doug Anderson
0 siblings, 0 replies; 8+ messages in thread
From: Doug Anderson @ 2023-08-02 20:53 UTC (permalink / raw)
To: Sheng-Liang Pan
Cc: LKML, Andy Gross, Bjorn Andersson, Conor Dooley, Konrad Dybcio,
Krzysztof Kozlowski, Rob Herring, cros-qcom-dts-watchers,
devicetree, linux-arm-msm
Hi,
On Wed, Aug 2, 2023 at 2:58 AM Sheng-Liang Pan
<sheng-liang.pan@quanta.corp-partner.google.com> wrote:
>
> SKU ID 10: Lazor LTE+Wifi, no-esim (Strapped 0 X 0)
> SKU ID 15: Limozeen LTE+Wifi, TS, no esim (Strapped 1 X 0)
> SKU ID 18: Limozeen LTE+Wifi, no TS, no esim (Strapped X 0 0)
>
> Even though the "no esim" boards are strapped differently than
> ones that have an esim, the esim isn't represented in the
> device tree so the same device tree can be used for LTE w/ esim
> and LTE w/out esim.
>
> Signed-off-by: Sheng-Liang Pan <sheng-liang.pan@quanta.corp-partner.google.com>
> ---
>
> .../boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
Looks fine to me. One nit is that in the ${SUBJECT} you probably want
"sc7180", so:
arm64: dts: qcom: sc7180: Add sku_id for lazor/limozeen
Once that's fixed feel free to include:
Reviewed-by: Douglas Anderson <dianders@chromium.org>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/3] arm64: dts: qcom: Add board id for lazor/limozeen
2023-08-02 9:57 [PATCH 0/3] Add no-esim sku for sc7180-lazor family and new board version Sheng-Liang Pan
2023-08-02 9:57 ` [PATCH 1/3] dt-bindings: arm: qcom: add sc7180-lazor board bindings Sheng-Liang Pan
2023-08-02 9:57 ` [PATCH 2/3] arm64: dts: qcom: Add sku_id for lazor/limozeen Sheng-Liang Pan
@ 2023-08-02 9:57 ` Sheng-Liang Pan
2023-08-02 20:53 ` Doug Anderson
2023-08-08 16:11 ` Krzysztof Kozlowski
2 siblings, 2 replies; 8+ messages in thread
From: Sheng-Liang Pan @ 2023-08-02 9:57 UTC (permalink / raw)
To: LKML
Cc: dianders, Sheng-Liang Pan, Andy Gross, Bjorn Andersson,
Conor Dooley, Konrad Dybcio, Krzysztof Kozlowski, Rob Herring,
cros-qcom-dts-watchers, devicetree, linux-arm-msm
add BRD_ID(0, Z, 0) = 10 for new board with ALC5682i-VS
Signed-off-by: Sheng-Liang Pan <sheng-liang.pan@quanta.corp-partner.google.com>
---
arch/arm64/boot/dts/qcom/Makefile | 5 ++
...sc7180-trogdor-lazor-limozeen-nots-r10.dts | 39 +++++++++++++
.../sc7180-trogdor-lazor-limozeen-nots-r9.dts | 4 +-
.../sc7180-trogdor-lazor-limozeen-r10.dts | 55 +++++++++++++++++++
.../qcom/sc7180-trogdor-lazor-limozeen-r9.dts | 4 +-
.../dts/qcom/sc7180-trogdor-lazor-r10-kb.dts | 33 +++++++++++
.../dts/qcom/sc7180-trogdor-lazor-r10-lte.dts | 37 +++++++++++++
.../dts/qcom/sc7180-trogdor-lazor-r10.dts | 29 ++++++++++
.../dts/qcom/sc7180-trogdor-lazor-r9-kb.dts | 4 +-
.../dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 4 +-
.../boot/dts/qcom/sc7180-trogdor-lazor-r9.dts | 4 +-
11 files changed, 208 insertions(+), 10 deletions(-)
create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts
create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r10.dts
create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-kb.dts
create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-lte.dts
create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10.dts
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 337abc4ceb17..73e745fb1ff0 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -109,11 +109,16 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3-lte.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9-kb.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9-lte.dtb
+dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10.dtb
+dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10-kb.dtb
+dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10-lte.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r4.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r9.dtb
+dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r10.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r4.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r5.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r9.dtb
+dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r10.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-parade.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-ti.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-parade.dtb
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts
new file mode 100644
index 000000000000..63602feceea6
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Lazor Limozeen board device tree source
+ *
+ * Copyright 2021 Google LLC.
+ */
+
+/dts-v1/;
+
+#include "sc7180.dtsi"
+#include "sc7180-trogdor-parade-ps8640.dtsi"
+#include "sc7180-trogdor-lazor.dtsi"
+#include "sc7180-trogdor-lte-sku.dtsi"
+
+/ {
+ model = "Google Lazor Limozeen without Touchscreen (rev10+, rt5682s)";
+ compatible = "google,lazor-sku6", "google,lazor-sku18", "qcom,sc7180";
+};
+
+/delete-node/&ap_ts;
+
+&panel {
+ compatible = "edp-panel";
+};
+
+&sdhc_2 {
+ status = "okay";
+};
+
+&alc5682 {
+ compatible = "realtek,rt5682s";
+ realtek,dmic1-clk-pin = <2>;
+ realtek,dmic-clk-rate-hz = <2048000>;
+};
+
+&sound {
+ compatible = "google,sc7180-trogdor";
+ model = "sc7180-rt5682s-max98357a-1mic";
+};
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 cef57c15b70b..e3f1f30a7fc3 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
@@ -13,8 +13,8 @@
#include "sc7180-trogdor-lte-sku.dtsi"
/ {
- model = "Google Lazor Limozeen without Touchscreen (rev9+)";
- compatible = "google,lazor-sku6", "google,lazor-sku18", "qcom,sc7180";
+ model = "Google Lazor Limozeen without Touchscreen (rev9)";
+ compatible = "google,lazor-rev9-sku6", "google,lazor-rev9-sku18", "qcom,sc7180";
};
/delete-node/&ap_ts;
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r10.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r10.dts
new file mode 100644
index 000000000000..d0395a4b5cbb
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r10.dts
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Lazor Limozeen board device tree source
+ *
+ * Copyright 2021 Google LLC.
+ */
+
+/dts-v1/;
+
+#include "sc7180.dtsi"
+#include "sc7180-trogdor-parade-ps8640.dtsi"
+#include "sc7180-trogdor-lazor.dtsi"
+#include "sc7180-trogdor-lte-sku.dtsi"
+
+/ {
+ model = "Google Lazor Limozeen (rev10+, rt5682s)";
+ compatible = "google,lazor-sku4", "google,lazor-sku15", "qcom,sc7180";
+};
+
+/delete-node/&ap_ts;
+
+&ap_ts_pen_1v8 {
+ ap_ts: touchscreen@10 {
+ compatible = "elan,ekth3500";
+ reg = <0x10>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&ts_int_l>, <&ts_reset_l>;
+
+ interrupt-parent = <&tlmm>;
+ interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
+
+ vcc33-supply = <&pp3300_ts>;
+
+ reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>;
+ };
+};
+
+&panel {
+ compatible = "auo,b116xa01";
+};
+
+&sdhc_2 {
+ status = "okay";
+};
+
+&alc5682 {
+ compatible = "realtek,rt5682s";
+ realtek,dmic1-clk-pin = <2>;
+ realtek,dmic-clk-rate-hz = <2048000>;
+};
+
+&sound {
+ compatible = "google,sc7180-trogdor";
+ model = "sc7180-rt5682s-max98357a-1mic";
+};
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 2038a82bc0e7..3b6053f3e62b 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
@@ -13,8 +13,8 @@
#include "sc7180-trogdor-lte-sku.dtsi"
/ {
- model = "Google Lazor Limozeen (rev9+)";
- compatible = "google,lazor-sku4", "google,lazor-sku15", "qcom,sc7180";
+ model = "Google Lazor Limozeen (rev9)";
+ compatible = "google,lazor-rev9-sku4", "google,lazor-rev9-sku15", "qcom,sc7180";
};
/delete-node/&ap_ts;
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-kb.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-kb.dts
new file mode 100644
index 000000000000..26e5cfcd00fe
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-kb.dts
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Lazor board device tree source
+ *
+ * Copyright 2020 Google LLC.
+ */
+
+/dts-v1/;
+
+#include "sc7180.dtsi"
+#include "sc7180-trogdor-parade-ps8640.dtsi"
+#include "sc7180-trogdor-lazor.dtsi"
+#include "sc7180-lite.dtsi"
+
+/ {
+ model = "Google Lazor (rev10+, rt5682s) with KB Backlight";
+ compatible = "google,lazor-sku2", "qcom,sc7180";
+};
+
+&keyboard_backlight {
+ status = "okay";
+};
+
+&alc5682 {
+ compatible = "realtek,rt5682s";
+ realtek,dmic1-clk-pin = <2>;
+ realtek,dmic-clk-rate-hz = <2048000>;
+};
+
+&sound {
+ compatible = "google,sc7180-trogdor";
+ model = "sc7180-rt5682s-max98357a-1mic";
+};
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-lte.dts
new file mode 100644
index 000000000000..026460ce3893
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-lte.dts
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Lazor board device tree source
+ *
+ * Copyright 2021 Google LLC.
+ */
+
+/dts-v1/;
+
+#include "sc7180.dtsi"
+#include "sc7180-trogdor-parade-ps8640.dtsi"
+#include "sc7180-trogdor-lazor.dtsi"
+#include "sc7180-trogdor-lte-sku.dtsi"
+
+/ {
+ model = "Google Lazor (rev10+, rt5682s) with LTE";
+ compatible = "google,lazor-sku0", "google,lazor-sku10", "qcom,sc7180";
+};
+
+&ap_sar_sensor_i2c {
+ status = "okay";
+};
+
+&keyboard_backlight {
+ status = "okay";
+};
+
+&alc5682 {
+ compatible = "realtek,rt5682s";
+ realtek,dmic1-clk-pin = <2>;
+ realtek,dmic-clk-rate-hz = <2048000>;
+};
+
+&sound {
+ compatible = "google,sc7180-trogdor";
+ model = "sc7180-rt5682s-max98357a-1mic";
+};
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10.dts
new file mode 100644
index 000000000000..40f618da3c7a
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10.dts
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Lazor board device tree source
+ *
+ * Copyright 2021 Google LLC.
+ */
+
+/dts-v1/;
+
+#include "sc7180.dtsi"
+#include "sc7180-trogdor-parade-ps8640.dtsi"
+#include "sc7180-trogdor-lazor.dtsi"
+#include "sc7180-lite.dtsi"
+
+/ {
+ model = "Google Lazor (rev10+, rt5682s)";
+ compatible = "google,lazor", "qcom,sc7180";
+};
+
+&alc5682 {
+ compatible = "realtek,rt5682s";
+ realtek,dmic1-clk-pin = <2>;
+ realtek,dmic-clk-rate-hz = <2048000>;
+};
+
+&sound {
+ compatible = "google,sc7180-trogdor";
+ model = "sc7180-rt5682s-max98357a-1mic";
+};
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 960f7b7ce094..f74a1985cac6 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
@@ -13,8 +13,8 @@
#include "sc7180-lite.dtsi"
/ {
- model = "Google Lazor (rev9+) with KB Backlight";
- compatible = "google,lazor-sku2", "qcom,sc7180";
+ model = "Google Lazor (rev9) with KB Backlight";
+ compatible = "google,lazor-rev9-sku2", "qcom,sc7180";
};
&keyboard_backlight {
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 438ab9cd3389..15dcf95da311 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
@@ -13,8 +13,8 @@
#include "sc7180-trogdor-lte-sku.dtsi"
/ {
- model = "Google Lazor (rev9+) with LTE";
- compatible = "google,lazor-sku0", "google,lazor-sku10", "qcom,sc7180";
+ model = "Google Lazor (rev9) with LTE";
+ compatible = "google,lazor-rev9-sku0", "google,lazor-rev9-sku10", "qcom,sc7180";
};
&ap_sar_sensor_i2c {
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 56dd222650d3..44f61bc56f81 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts
@@ -13,6 +13,6 @@
#include "sc7180-lite.dtsi"
/ {
- model = "Google Lazor (rev9+)";
- compatible = "google,lazor", "qcom,sc7180";
+ model = "Google Lazor (rev9)";
+ compatible = "google,lazor-rev9", "qcom,sc7180";
};
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 3/3] arm64: dts: qcom: Add board id for lazor/limozeen
2023-08-02 9:57 ` [PATCH 3/3] arm64: dts: qcom: Add board id " Sheng-Liang Pan
@ 2023-08-02 20:53 ` Doug Anderson
2023-08-08 16:11 ` Krzysztof Kozlowski
1 sibling, 0 replies; 8+ messages in thread
From: Doug Anderson @ 2023-08-02 20:53 UTC (permalink / raw)
To: Sheng-Liang Pan
Cc: LKML, Andy Gross, Bjorn Andersson, Conor Dooley, Konrad Dybcio,
Krzysztof Kozlowski, Rob Herring, cros-qcom-dts-watchers,
devicetree, linux-arm-msm
Hi,
On Wed, Aug 2, 2023 at 2:58 AM Sheng-Liang Pan
<sheng-liang.pan@quanta.corp-partner.google.com> wrote:
>
> add BRD_ID(0, Z, 0) = 10 for new board with ALC5682i-VS
>
> Signed-off-by: Sheng-Liang Pan <sheng-liang.pan@quanta.corp-partner.google.com>
> ---
>
> arch/arm64/boot/dts/qcom/Makefile | 5 ++
> ...sc7180-trogdor-lazor-limozeen-nots-r10.dts | 39 +++++++++++++
> .../sc7180-trogdor-lazor-limozeen-nots-r9.dts | 4 +-
> .../sc7180-trogdor-lazor-limozeen-r10.dts | 55 +++++++++++++++++++
> .../qcom/sc7180-trogdor-lazor-limozeen-r9.dts | 4 +-
> .../dts/qcom/sc7180-trogdor-lazor-r10-kb.dts | 33 +++++++++++
> .../dts/qcom/sc7180-trogdor-lazor-r10-lte.dts | 37 +++++++++++++
> .../dts/qcom/sc7180-trogdor-lazor-r10.dts | 29 ++++++++++
> .../dts/qcom/sc7180-trogdor-lazor-r9-kb.dts | 4 +-
> .../dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 4 +-
> .../boot/dts/qcom/sc7180-trogdor-lazor-r9.dts | 4 +-
> 11 files changed, 208 insertions(+), 10 deletions(-)
> create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts
> create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r10.dts
> create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-kb.dts
> create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-lte.dts
> create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10.dts
>
> diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
> index 337abc4ceb17..73e745fb1ff0 100644
> --- a/arch/arm64/boot/dts/qcom/Makefile
> +++ b/arch/arm64/boot/dts/qcom/Makefile
> @@ -109,11 +109,16 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3-lte.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9-kb.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9-lte.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10-kb.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10-lte.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r4.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r9.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r10.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r4.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r5.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r9.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r10.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-parade.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-ti.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-parade.dtb
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts
> new file mode 100644
> index 000000000000..63602feceea6
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts
> @@ -0,0 +1,39 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Google Lazor Limozeen board device tree source
> + *
> + * Copyright 2021 Google LLC.
nit: for newly created files you usually want to pick this year
(2023). I assume Google doesn't mind you assigning them the copyright,
but you could probably also put Quanta here if your legal cares. The
licensing is still "(GPL-2.0+ OR MIT)" as per the first line of the
file.
> + */
> +
> +/dts-v1/;
> +
> +#include "sc7180.dtsi"
Shouldn't the above include be of "sc7180-trogdor.dtsi"? That would
make it match -r9. I would sorta believe it wouldn't compile
otherwise.
> +#include "sc7180-trogdor-parade-ps8640.dtsi"
> +#include "sc7180-trogdor-lazor.dtsi"
> +#include "sc7180-trogdor-lte-sku.dtsi"
> +
> +/ {
> + model = "Google Lazor Limozeen without Touchscreen (rev10+, rt5682s)";
nit: "rt5682s" is implied by "rev10+", so you don't need to include it
in the model name.
> + compatible = "google,lazor-sku6", "google,lazor-sku18", "qcom,sc7180";
> +};
> +
> +/delete-node/&ap_ts;
> +
> +&panel {
> + compatible = "edp-panel";
> +};
> +
> +&sdhc_2 {
> + status = "okay";
> +};
> +
> +&alc5682 {
> + compatible = "realtek,rt5682s";
> + realtek,dmic1-clk-pin = <2>;
> + realtek,dmic-clk-rate-hz = <2048000>;
Looking at other trogdor device tree files, you also need:
/delete-property/ VBAT-supply;
I believe that "make dtbs_check" will complain otherwise.
Also note that these things should be sorted alphabetically, so your
"alc5682" node should be above "ap_ts_pen_1v8".
I guess in theory we could add a "sc7180-trogdor-rt5682s.dtsi"
fragment since so many boards are using it now, though I won't insist
on it.
Similar comments for your modifications to some of the other files.
-Doug
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 3/3] arm64: dts: qcom: Add board id for lazor/limozeen
2023-08-02 9:57 ` [PATCH 3/3] arm64: dts: qcom: Add board id " Sheng-Liang Pan
2023-08-02 20:53 ` Doug Anderson
@ 2023-08-08 16:11 ` Krzysztof Kozlowski
1 sibling, 0 replies; 8+ messages in thread
From: Krzysztof Kozlowski @ 2023-08-08 16:11 UTC (permalink / raw)
To: Sheng-Liang Pan, LKML
Cc: dianders, Andy Gross, Bjorn Andersson, Conor Dooley,
Konrad Dybcio, Krzysztof Kozlowski, Rob Herring,
cros-qcom-dts-watchers, devicetree, linux-arm-msm
On 02/08/2023 11:57, Sheng-Liang Pan wrote:
> add BRD_ID(0, Z, 0) = 10 for new board with ALC5682i-VS
>
> Signed-off-by: Sheng-Liang Pan <sheng-liang.pan@quanta.corp-partner.google.com>
> ---
>
> arch/arm64/boot/dts/qcom/Makefile | 5 ++
> ...sc7180-trogdor-lazor-limozeen-nots-r10.dts | 39 +++++++++++++
> .../sc7180-trogdor-lazor-limozeen-nots-r9.dts | 4 +-
> .../sc7180-trogdor-lazor-limozeen-r10.dts | 55 +++++++++++++++++++
> .../qcom/sc7180-trogdor-lazor-limozeen-r9.dts | 4 +-
> .../dts/qcom/sc7180-trogdor-lazor-r10-kb.dts | 33 +++++++++++
> .../dts/qcom/sc7180-trogdor-lazor-r10-lte.dts | 37 +++++++++++++
> .../dts/qcom/sc7180-trogdor-lazor-r10.dts | 29 ++++++++++
> .../dts/qcom/sc7180-trogdor-lazor-r9-kb.dts | 4 +-
> .../dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 4 +-
> .../boot/dts/qcom/sc7180-trogdor-lazor-r9.dts | 4 +-
> 11 files changed, 208 insertions(+), 10 deletions(-)
> create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts
> create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r10.dts
> create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-kb.dts
> create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-lte.dts
> create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10.dts
>
> diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
> index 337abc4ceb17..73e745fb1ff0 100644
> --- a/arch/arm64/boot/dts/qcom/Makefile
> +++ b/arch/arm64/boot/dts/qcom/Makefile
> @@ -109,11 +109,16 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3-lte.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9-kb.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9-lte.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10-kb.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10-lte.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r4.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r9.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r10.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r4.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r5.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r9.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r10.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-parade.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-ti.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-parade.dtb
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts
> new file mode 100644
> index 000000000000..63602feceea6
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts
> @@ -0,0 +1,39 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Google Lazor Limozeen board device tree source
> + *
> + * Copyright 2021 Google LLC.
> + */
> +
> +/dts-v1/;
> +
> +#include "sc7180.dtsi"
> +#include "sc7180-trogdor-parade-ps8640.dtsi"
> +#include "sc7180-trogdor-lazor.dtsi"
> +#include "sc7180-trogdor-lte-sku.dtsi"
> +
> +/ {
> + model = "Google Lazor Limozeen without Touchscreen (rev10+, rt5682s)";
> + compatible = "google,lazor-sku6", "google,lazor-sku18", "qcom,sc7180";
> +};
> +
> +/delete-node/&ap_ts;
> +
> +&panel {
> + compatible = "edp-panel";
> +};
> +
> +&sdhc_2 {
> + status = "okay";
> +};
> +
> +&alc5682 {
> + compatible = "realtek,rt5682s";
> + realtek,dmic1-clk-pin = <2>;
> + realtek,dmic-clk-rate-hz = <2048000>;
> +};
> +
> +&sound {
Overrides are ordered by name.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 8+ messages in thread