pazquel360 is an extension project based on pazquel.
We create 3 sku on pazquel360:
sku 20 for LTE with physical SIM _and_ eSIM and WiFi
sku 21 for WiFi only
sku 22 for LTE with only a physical SIM
Both sku20 and sku22 are LTE SKUs.
One has the eSIM stuffed and one doesn't.
There is a single shared device tree for the two.
Signed-off-by: Yunlong Jia <[email protected]>
Reviewed-by: Douglas Anderson <[email protected]>
---
Changes in v4:
1. Adjust the 'Signed-off-by'.
Changes in v3:
1. Adjust the format of the changelog.
Documentation/devicetree/bindings/arm/qcom.yaml | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml
index 944b364bed12a..8060c35d003b4 100644
--- a/Documentation/devicetree/bindings/arm/qcom.yaml
+++ b/Documentation/devicetree/bindings/arm/qcom.yaml
@@ -390,6 +390,17 @@ properties:
- const: google,pazquel-sku2
- const: qcom,sc7180
+ - description: Google Pazquel360 with LTE (newest rev)
+ items:
+ - const: google,pazquel-sku22
+ - const: google,pazquel-sku20
+ - const: qcom,sc7180
+
+ - description: Google Pazquel360 with WiFi (newest rev)
+ items:
+ - const: google,pazquel-sku21
+ - const: qcom,sc7180
+
- description: Sharp Dynabook Chromebook C1 (rev1)
items:
- const: google,pompom-rev1
--
2.17.1
Add an elan touch screen chip eth3915n.
Signed-off-by: Yunlong Jia <[email protected]>
Reviewed-by: Douglas Anderson <[email protected]>
---
(no changes since v1)
.../devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml b/Documentation/devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml
index a9b53c2e6f0ab..d28625372f5ac 100644
--- a/Documentation/devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml
+++ b/Documentation/devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml
@@ -17,6 +17,7 @@ properties:
enum:
- elan,ektf3624
- elan,ekth3500
+ - elan,ekth3915
reg:
maxItems: 1
--
2.17.1
Create first version device tree for pazquel360
pazquel360 is convertible and the pazquel it is based on is clamshell.
sku 20 for lte & wifi
sku 21 for wifi only
sku 22 for lte w/o esim & wifi
Signed-off-by: Yunlong Jia <[email protected]>
Reviewed-by: Douglas Anderson <[email protected]>
---
Changes in v4:
1. Adjust the 'Signed-off-by'.
2. Add touchscreen setting in dtsi.
Changes in v2:
1. Remove the touchscreen setting, as a follow-up patch
arch/arm64/boot/dts/qcom/Makefile | 2 +
.../qcom/sc7180-trogdor-pazquel360-lte.dts | 22 ++++++
.../qcom/sc7180-trogdor-pazquel360-wifi.dts | 17 +++++
.../dts/qcom/sc7180-trogdor-pazquel360.dtsi | 71 +++++++++++++++++++
4 files changed, 112 insertions(+)
create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360-lte.dts
create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360-wifi.dts
create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index d8192a2eaa754..65cb0f714ed6b 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -76,6 +76,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-parade.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-ti.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-parade.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-ti.dtb
+dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel360-lte.dtb
+dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel360-wifi.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r1.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r1-lte.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r2.dtb
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360-lte.dts
new file mode 100644
index 0000000000000..021bcafcf8154
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360-lte.dts
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Pazquel board device tree source
+ *
+ * Copyright 2021 Google LLC.
+ */
+
+/dts-v1/;
+
+#include "sc7180-trogdor.dtsi"
+#include "sc7180-trogdor-parade-ps8640.dtsi"
+#include "sc7180-trogdor-pazquel360.dtsi"
+#include "sc7180-trogdor-lte-sku.dtsi"
+
+/ {
+ model = "Google Pazquel (Parade,LTE)";
+ compatible = "google,pazquel-sku22", "google,pazquel-sku20", "qcom,sc7180";
+};
+
+&ap_sar_sensor_i2c {
+ status = "okay";
+};
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360-wifi.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360-wifi.dts
new file mode 100644
index 0000000000000..defd84c5354a0
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360-wifi.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Pazquel board device tree source
+ *
+ * Copyright 2022 Google LLC.
+ */
+
+/dts-v1/;
+
+#include "sc7180-trogdor.dtsi"
+#include "sc7180-trogdor-parade-ps8640.dtsi"
+#include "sc7180-trogdor-pazquel360.dtsi"
+
+/ {
+ model = "Google Pazquel (Parade,WIFI-only)";
+ compatible = "google,pazquel-sku21", "qcom,sc7180";
+};
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi
new file mode 100644
index 0000000000000..54b89def84020
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi
@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Pazquel board device tree source
+ *
+ * Copyright 2021 Google LLC.
+ */
+
+/* This file must be included after sc7180-trogdor.dtsi */
+#include "sc7180-trogdor-pazquel.dtsi"
+
+&alc5682 {
+ compatible = "realtek,rt5682s";
+ realtek,dmic1-clk-pin = <2>;
+ realtek,dmic-clk-rate-hz = <2048000>;
+};
+
+ap_ts_pen_1v8: &i2c4 {
+ status = "okay";
+ clock-frequency = <400000>;
+
+ ap_ts: touchscreen@10 {
+ compatible = "elan,ekth3915", "elan,ekth3500";
+ reg = <0x10>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&ts_int_l>, <&ts_reset_l>;
+
+ interrupt-parent = <&tlmm>;
+ interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
+
+ hid-descr-addr = <0x0001>;
+
+ vcc33-supply = <&pp3300_ts>;
+ vccio-supply = <&pp1800_l10a>;
+ reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>;
+ };
+};
+
+&keyboard_controller {
+ function-row-physmap = <
+ MATRIX_KEY(0x00, 0x02, 0) /* T1 */
+ MATRIX_KEY(0x03, 0x02, 0) /* T2 */
+ MATRIX_KEY(0x02, 0x02, 0) /* T3 */
+ MATRIX_KEY(0x01, 0x02, 0) /* T4 */
+ MATRIX_KEY(0x03, 0x04, 0) /* T5 */
+ MATRIX_KEY(0x02, 0x04, 0) /* T6 */
+ MATRIX_KEY(0x01, 0x04, 0) /* T7 */
+ MATRIX_KEY(0x02, 0x09, 0) /* T8 */
+ MATRIX_KEY(0x01, 0x09, 0) /* T9 */
+ MATRIX_KEY(0x00, 0x04, 0) /* T10 */
+ MATRIX_KEY(0x03, 0x09, 0) /* T11 */
+ >;
+ linux,keymap = <
+ MATRIX_KEY(0x00, 0x02, KEY_BACK)
+ MATRIX_KEY(0x03, 0x02, KEY_REFRESH)
+ MATRIX_KEY(0x02, 0x02, KEY_ZOOM)
+ MATRIX_KEY(0x01, 0x02, KEY_SCALE)
+ MATRIX_KEY(0x03, 0x04, KEY_SYSRQ)
+ MATRIX_KEY(0x02, 0x04, KEY_BRIGHTNESSDOWN)
+ MATRIX_KEY(0x01, 0x04, KEY_BRIGHTNESSUP)
+ MATRIX_KEY(0x02, 0x09, KEY_MUTE)
+ MATRIX_KEY(0x01, 0x09, KEY_VOLUMEDOWN)
+ MATRIX_KEY(0x00, 0x04, KEY_VOLUMEUP)
+ MATRIX_KEY(0x03, 0x09, KEY_SLEEP)
+ CROS_STD_MAIN_KEYMAP
+ >;
+};
+
+&sound {
+ compatible = "google,sc7180-trogdor";
+ model = "sc7180-rt5682s-max98357a-1mic";
+};
--
2.17.1
The ekth3915 and ekth3500 are almost the same.
Signed-off-by: Yunlong Jia <[email protected]>
Reviewed-by: Douglas Anderson <[email protected]>
---
(no changes since v1)
drivers/input/touchscreen/elants_i2c.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
index c9dd703b0c7d8..a21c9c9ed4d78 100644
--- a/drivers/input/touchscreen/elants_i2c.c
+++ b/drivers/input/touchscreen/elants_i2c.c
@@ -133,6 +133,7 @@
enum elants_chip_id {
EKTH3500,
EKTF3624,
+ EKTH3915,
};
enum elants_state {
@@ -664,6 +665,7 @@ static int elants_i2c_initialize(struct elants_data *ts)
switch (ts->chip_id) {
case EKTH3500:
+ case EKTH3915:
if (!error)
error = elants_i2c_query_ts_info_ekth(ts);
break;
@@ -1686,6 +1688,7 @@ static const struct i2c_device_id elants_i2c_id[] = {
{ DEVICE_NAME, EKTH3500 },
{ "ekth3500", EKTH3500 },
{ "ektf3624", EKTF3624 },
+ { "ekth3915", EKTH3915 },
{ }
};
MODULE_DEVICE_TABLE(i2c, elants_i2c_id);
@@ -1702,6 +1705,7 @@ MODULE_DEVICE_TABLE(acpi, elants_acpi_id);
static const struct of_device_id elants_of_match[] = {
{ .compatible = "elan,ekth3500", .data = (void *)EKTH3500 },
{ .compatible = "elan,ektf3624", .data = (void *)EKTF3624 },
+ { .compatible = "elan,ekth3915", .data = (void *)EKTH3915 },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, elants_of_match);
--
2.17.1
Hi,
On Thu, Sep 22, 2022 at 3:22 AM Yunlong Jia <[email protected]> wrote:
>
> Create first version device tree for pazquel360
> pazquel360 is convertible and the pazquel it is based on is clamshell.
> sku 20 for lte & wifi
> sku 21 for wifi only
> sku 22 for lte w/o esim & wifi
>
> Signed-off-by: Yunlong Jia <[email protected]>
> Reviewed-by: Douglas Anderson <[email protected]>
>
> ---
>
> Changes in v4:
> 1. Adjust the 'Signed-off-by'.
> 2. Add touchscreen setting in dtsi.
Just to be clear, I've looked at the differences in v4 and I'm still
fine with my Reviewed-by as was carried by Yunlong.
Also note that this should be the last patch in the series. The
"ekth3915" bindings are relevant to it and bindings should be earlier
in the series.
-Doug
Hi,
On Thu, Sep 22, 2022 at 3:23 AM Yunlong Jia <[email protected]> wrote:
>
> Add an elan touch screen chip eth3915n.
>
> Signed-off-by: Yunlong Jia <[email protected]>
> Reviewed-by: Douglas Anderson <[email protected]>
You should have left my Reviewed-by off in this case. I haven't
actually seen this patch. You could have possibly added "Suggested-by"
or just left me off entirely until I gave you the tag.
> ---
>
> (no changes since v1)
I probably would have added this in patman:
Series-changes: 4
- eth3915n dt bindings added in v4.
Without that you get the "(no changes from v1)" which is always weird
since this patch is new for v4.
> .../devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml b/Documentation/devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml
> index a9b53c2e6f0ab..d28625372f5ac 100644
> --- a/Documentation/devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml
> +++ b/Documentation/devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml
> @@ -17,6 +17,7 @@ properties:
> enum:
> - elan,ektf3624
> - elan,ekth3500
> + - elan,ekth3915
This is not quite right because for elan,ekth3915 you're expecting
device trees to have:
compatible = "elan,ekth3915", "elan,ekth3500"
In other words it's actually a 3915 but the 3500 driver should work
fine. I believe a reasonable syntax is:
compatible:
oneOf:
- enum:
- elan,ektf3624
- elan,ekth3500
- items:
- const: elan,ekth3915
- const: elan,ekth3500
-Doug
Hi,
On Thu, Sep 22, 2022 at 3:23 AM Yunlong Jia <[email protected]> wrote:
>
> The ekth3915 and ekth3500 are almost the same.
>
> Signed-off-by: Yunlong Jia <[email protected]>
> Reviewed-by: Douglas Anderson <[email protected]>
You shouldn't have added my Reviewed-by here. I haven't seen this patch before.
Also: you should drop this patch. The way we've specified it in the
bindings you can rely on the "fallback" compatible string for the 3500
to handle things.
Hi,
On Thu, Sep 22, 2022 at 3:21 AM Yunlong Jia <[email protected]> wrote:
>
> pazquel360 is an extension project based on pazquel.
> We create 3 sku on pazquel360:
> sku 20 for LTE with physical SIM _and_ eSIM and WiFi
> sku 21 for WiFi only
> sku 22 for LTE with only a physical SIM
> Both sku20 and sku22 are LTE SKUs.
> One has the eSIM stuffed and one doesn't.
> There is a single shared device tree for the two.
>
> Signed-off-by: Yunlong Jia <[email protected]>
> Reviewed-by: Douglas Anderson <[email protected]>
>
> ---
>
> Changes in v4:
> 1. Adjust the 'Signed-off-by'.
>
> Changes in v3:
> 1. Adjust the format of the changelog.
>
> Documentation/devicetree/bindings/arm/qcom.yaml | 11 +++++++++++
> 1 file changed, 11 insertions(+)
You should have carried the Ack that you had on v3 [1]. Please send a
v5 with that fixed. AKA:
Acked-by: Krzysztof Kozlowski <[email protected]>
[1] https://lore.kernel.org/r/20220901024827.v3.1.I3aa360986c0e7377ea5e96c116f014ff1ab8c968@changeid/