Add makomo, pico, and katsu which are mt8183 followers.
Hsin-Yi Wang (6):
dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-katsu
arm64: dts: mt8183: Add kukui katsu board
dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-jacuzzi-makomo
arm64: dts: mt8183: Add jacuzzi makomo board
dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-jacuzzi-pico
arm64: dts: mt8183: Add jacuzzi pico/pico6 board
.../devicetree/bindings/arm/mediatek.yaml | 25 ++++
.../mt8183-kukui-jacuzzi-makomo-sku0.dts | 25 ++++
.../mt8183-kukui-jacuzzi-makomo-sku1.dts | 25 ++++
.../mediatek/mt8183-kukui-jacuzzi-pico.dts | 36 ++++++
.../mediatek/mt8183-kukui-jacuzzi-pico6.dts | 110 ++++++++++++++++++
.../dts/mediatek/mt8183-kukui-katsu-sku38.dts | 44 +++++++
.../boot/dts/mediatek/mt8183-kukui-katsu.dts | 40 +++++++
7 files changed, 305 insertions(+)
create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku0.dts
create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku1.dts
create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico.dts
create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts
create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts
create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu.dts
--
2.42.0.758.gaed0368e0e-goog
Add katsu and katsu sku38 which uses different audio codec.
Signed-off-by: Hsin-Yi Wang <[email protected]>
---
Documentation/devicetree/bindings/arm/mediatek.yaml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/mediatek.yaml b/Documentation/devicetree/bindings/arm/mediatek.yaml
index a5999b3afc35..fe8c488a3207 100644
--- a/Documentation/devicetree/bindings/arm/mediatek.yaml
+++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
@@ -235,6 +235,12 @@ properties:
items:
- const: google,kappa
- const: mediatek,mt8183
+ - description: Google Katsu (ASUS Chromebook Detachable CZ1)
+ items:
+ - enum:
+ - google,katsu
+ - google,katsu-sku38
+ - const: mediatek,mt8183
- description: Google Kodama (Lenovo 10e Chromebook Tablet)
items:
- enum:
--
2.42.0.758.gaed0368e0e-goog
Add makomo sku0 and sku1 which uses different audio codec.
Signed-off-by: Hsin-Yi Wang <[email protected]>
---
Documentation/devicetree/bindings/arm/mediatek.yaml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/mediatek.yaml b/Documentation/devicetree/bindings/arm/mediatek.yaml
index fe8c488a3207..b131e0bdbf01 100644
--- a/Documentation/devicetree/bindings/arm/mediatek.yaml
+++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
@@ -250,6 +250,18 @@ properties:
- google,kodama-sku32
- const: google,kodama
- const: mediatek,mt8183
+ - description: Google Makomo (Lenovo 100e Chromebook 2nd Gen MTK 2)
+ items:
+ - const: google,makomo-rev4-sku0
+ - const: google,makomo-rev5-sku0
+ - const: google,makomo
+ - const: mediatek,mt8183
+ - description: Google Makomo (Lenovo 100e Chromebook 2nd Gen MTK 2)
+ items:
+ - const: google,makomo-rev4-sku1
+ - const: google,makomo-rev5-sku1
+ - const: google,makomo
+ - const: mediatek,mt8183
- description: Google Willow (Acer Chromebook 311 C722/C722T)
items:
- enum:
--
2.42.0.758.gaed0368e0e-goog
makomo is also known as Lenovo 100e Chromebook 2nd Gen MTK 2.
Signed-off-by: Hsin-Yi Wang <[email protected]>
---
.../mt8183-kukui-jacuzzi-makomo-sku0.dts | 25 +++++++++++++++++++
.../mt8183-kukui-jacuzzi-makomo-sku1.dts | 25 +++++++++++++++++++
2 files changed, 50 insertions(+)
create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku0.dts
create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku1.dts
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku0.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku0.dts
new file mode 100644
index 000000000000..b80be5dbcd7b
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku0.dts
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2023 Google LLC
+ */
+
+/dts-v1/;
+#include "mt8183-kukui-jacuzzi-fennel.dtsi"
+#include "mt8183-kukui-audio-da7219-rt1015p.dtsi"
+
+/ {
+ model = "Google makomo sku0 board";
+ chassis-type = "laptop";
+ compatible = "google,makomo-rev4-sku0", "google,makomo-rev5-sku0",
+ "google,makomo", "mediatek,mt8183";
+};
+
+&qca_wifi {
+ qcom,ath10k-calibration-variant = "GO_FENNEL14";
+};
+
+&mmc1_pins_uhs {
+ pins_clk {
+ drive-strength = <MTK_DRIVE_6mA>;
+ };
+};
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku1.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku1.dts
new file mode 100644
index 000000000000..46da8c50aaa9
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku1.dts
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2023 Google LLC
+ */
+
+/dts-v1/;
+#include "mt8183-kukui-jacuzzi-fennel.dtsi"
+#include "mt8183-kukui-audio-ts3a227e-rt1015p.dtsi"
+
+/ {
+ model = "Google makomo sku1 board";
+ chassis-type = "laptop";
+ compatible = "google,makomo-rev4-sku1", "google,makomo-rev5-sku1",
+ "google,makomo", "mediatek,mt8183";
+};
+
+&qca_wifi {
+ qcom,ath10k-calibration-variant = "GO_FENNEL14";
+};
+
+&mmc1_pins_uhs {
+ pins_clk {
+ drive-strength = <MTK_DRIVE_6mA>;
+ };
+};
--
2.42.0.758.gaed0368e0e-goog
pico is also known as Acer Chromebook Spin 311.
Signed-off-by: Hsin-Yi Wang <[email protected]>
---
.../mediatek/mt8183-kukui-jacuzzi-pico.dts | 36 ++++++
.../mediatek/mt8183-kukui-jacuzzi-pico6.dts | 110 ++++++++++++++++++
2 files changed, 146 insertions(+)
create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico.dts
create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico.dts
new file mode 100644
index 000000000000..e230323b3a54
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico.dts
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2023 Google LLC
+ */
+
+/dts-v1/;
+#include "mt8183-kukui-jacuzzi.dtsi"
+#include "mt8183-kukui-audio-ts3a227e-max98357a.dtsi"
+
+/ {
+ model = "Google pico board";
+ chassis-type = "convertible";
+ compatible = "google,pico-sku1", "google,pico", "mediatek,mt8183";
+};
+
+&i2c_tunnel {
+ google,remote-bus = <0>;
+};
+
+&i2c2 {
+ i2c-scl-internal-delay-ns = <25000>;
+
+ trackpad@2c {
+ compatible = "hid-over-i2c";
+ reg = <0x2c>;
+ hid-descr-addr = <0x20>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&trackpad_pins>;
+
+ interrupts-extended = <&pio 7 IRQ_TYPE_LEVEL_LOW>;
+
+ wakeup-source;
+ };
+};
+
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts
new file mode 100644
index 000000000000..3e4bc451039e
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts
@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2023 Google LLC
+ */
+
+/dts-v1/;
+#include "mt8183-kukui-jacuzzi.dtsi"
+#include "mt8183-kukui-audio-ts3a227e-max98357a.dtsi"
+
+/ {
+ model = "Google pico6 board";
+ chassis-type = "convertible";
+ compatible = "google,pico-sku2", "google,pico", "mediatek,mt8183";
+
+ bt_wakeup: bt-wakeup {
+ compatible = "gpio-keys";
+ pinctrl-names = "default";
+ pinctrl-0 = <&bt_pins_wakeup>;
+
+ wobt {
+ label = "Wake on BT";
+ gpios = <&pio 42 GPIO_ACTIVE_HIGH>;
+ linux,code = <KEY_WAKEUP>;
+ wakeup-source;
+ };
+ };
+};
+
+&i2c_tunnel {
+ google,remote-bus = <0>;
+};
+
+&i2c2 {
+ i2c-scl-internal-delay-ns = <25000>;
+
+ trackpad@2c {
+ compatible = "hid-over-i2c";
+ reg = <0x2c>;
+ hid-descr-addr = <0x20>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&trackpad_pins>;
+
+ interrupts-extended = <&pio 7 IRQ_TYPE_LEVEL_LOW>;
+
+ wakeup-source;
+ };
+};
+
+&wifi_wakeup {
+ wowlan {
+ gpios = <&pio 113 GPIO_ACTIVE_LOW>;
+ };
+};
+
+&wifi_pwrseq {
+ post-power-on-delay-ms = <50>;
+
+ /* Toggle WIFI_ENABLE to reset the chip. */
+ reset-gpios = <&pio 8 1>;
+};
+
+&wifi_pins_pwrseq {
+ pins_wifi_enable {
+ pinmux = <PINMUX_GPIO8__FUNC_GPIO8>;
+ };
+};
+
+&mmc1_pins_default {
+ pins_cmd_dat {
+ drive-strength = <MTK_DRIVE_6mA>;
+ };
+ pins_clk {
+ drive-strength = <MTK_DRIVE_6mA>;
+ };
+};
+
+&mmc1_pins_uhs {
+ pins_clk {
+ drive-strength = <MTK_DRIVE_6mA>;
+ };
+};
+
+&mmc1 {
+ bt_reset: bt-reset {
+ compatible = "mediatek,mt7921s-bluetooth";
+ pinctrl-names = "default";
+ pinctrl-0 = <&bt_pins_reset>;
+ reset-gpios = <&pio 120 GPIO_ACTIVE_LOW>;
+ };
+};
+
+&pio {
+ bt_pins_wakeup: bt-pins-wakeup {
+ pins_bt_wakeup {
+ pinmux = <PINMUX_GPIO42__FUNC_GPIO42>;
+ input-enable;
+ };
+ };
+
+ bt_pins_reset: bt-pins-reset {
+ pins_bt_reset {
+ pinmux = <PINMUX_GPIO120__FUNC_GPIO120>;
+ output-high;
+ };
+ };
+};
+
+/delete-node/ &bluetooth;
+/delete-node/ &bt_pins;
--
2.42.0.758.gaed0368e0e-goog
kodama is also known as ASUS Chromebook Detachable CZ1.
Signed-off-by: Hsin-Yi Wang <[email protected]>
---
.../dts/mediatek/mt8183-kukui-katsu-sku38.dts | 44 +++++++++++++++++++
.../boot/dts/mediatek/mt8183-kukui-katsu.dts | 40 +++++++++++++++++
2 files changed, 84 insertions(+)
create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts
create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu.dts
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts
new file mode 100644
index 000000000000..491d04692432
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2023 Google LLC
+ */
+
+/dts-v1/;
+#include "mt8183-kukui-kakadu.dtsi"
+#include "mt8183-kukui-audio-rt1015p.dtsi"
+
+/ {
+ model = "Google katsu sku38 board";
+ chassis-type = "tablet";
+ compatible = "google,katsu-sku38", "mediatek,mt8183";
+};
+
+&i2c0 {
+ status = "okay";
+
+ /delete-node/touchscreen@10;
+ touchscreen1: touchscreen@5d {
+ compatible = "goodix,gt7375p";
+ reg = <0x5d>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&open_touch>;
+
+ interrupt-parent = <&pio>;
+ interrupts = <155 IRQ_TYPE_LEVEL_LOW>;
+
+ reset-gpios = <&pio 156 GPIO_ACTIVE_LOW>;
+ vdd-supply = <&lcd_pp3300>;
+ };
+};
+
+&panel {
+ compatible = "starry,2081101qfh032011-53g";
+};
+
+&qca_wifi {
+ qcom,ath10k-calibration-variant = "GO_KATSU";
+};
+
+&sound {
+ compatible = "mediatek,mt8183_mt6358_ts3a227_rt1015p";
+};
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu.dts
new file mode 100644
index 000000000000..595b0afdb2db
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu.dts
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2023 Google LLC
+ */
+
+/dts-v1/;
+#include "mt8183-kukui-kakadu.dtsi"
+#include "mt8183-kukui-audio-da7219-rt1015p.dtsi"
+
+/ {
+ model = "Google katsu board";
+ chassis-type = "tablet";
+ compatible = "google,katsu", "mediatek,mt8183";
+};
+
+&i2c0 {
+ status = "okay";
+
+ /delete-node/touchscreen@10;
+ touchscreen1: touchscreen@5d {
+ compatible = "goodix,gt7375p";
+ reg = <0x5d>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&open_touch>;
+
+ interrupt-parent = <&pio>;
+ interrupts = <155 IRQ_TYPE_LEVEL_LOW>;
+
+ reset-gpios = <&pio 156 GPIO_ACTIVE_LOW>;
+ vdd-supply = <&lcd_pp3300>;
+ };
+};
+
+&panel {
+ compatible = "starry,2081101qfh032011-53g";
+};
+
+&qca_wifi {
+ qcom,ath10k-calibration-variant = "GO_KATSU";
+};
--
2.42.0.758.gaed0368e0e-goog
Add pico (sku1) and pico6 (sku2).
Signed-off-by: Hsin-Yi Wang <[email protected]>
---
Documentation/devicetree/bindings/arm/mediatek.yaml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/mediatek.yaml b/Documentation/devicetree/bindings/arm/mediatek.yaml
index b131e0bdbf01..6bb1d80dd4eb 100644
--- a/Documentation/devicetree/bindings/arm/mediatek.yaml
+++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
@@ -262,6 +262,13 @@ properties:
- const: google,makomo-rev5-sku1
- const: google,makomo
- const: mediatek,mt8183
+ - description: Google Pico (Acer Chromebook Spin 311)
+ items:
+ - enum:
+ - google,pico-sku1
+ - google,pico-sku2
+ - const: google,pico
+ - const: mediatek,mt8183
- description: Google Willow (Acer Chromebook 311 C722/C722T)
items:
- enum:
--
2.42.0.758.gaed0368e0e-goog
On Mon, Oct 23, 2023 at 05:02:28PM -0700, Hsin-Yi Wang wrote:
> Add pico (sku1) and pico6 (sku2).
>
> Signed-off-by: Hsin-Yi Wang <[email protected]>
Acked-by: Conor Dooley <[email protected]>
Thanks,
Conor.
> ---
> Documentation/devicetree/bindings/arm/mediatek.yaml | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/mediatek.yaml b/Documentation/devicetree/bindings/arm/mediatek.yaml
> index b131e0bdbf01..6bb1d80dd4eb 100644
> --- a/Documentation/devicetree/bindings/arm/mediatek.yaml
> +++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
> @@ -262,6 +262,13 @@ properties:
> - const: google,makomo-rev5-sku1
> - const: google,makomo
> - const: mediatek,mt8183
> + - description: Google Pico (Acer Chromebook Spin 311)
> + items:
> + - enum:
> + - google,pico-sku1
> + - google,pico-sku2
> + - const: google,pico
> + - const: mediatek,mt8183
> - description: Google Willow (Acer Chromebook 311 C722/C722T)
> items:
> - enum:
> --
> 2.42.0.758.gaed0368e0e-goog
>
>
On Mon, Oct 23, 2023 at 05:02:24PM -0700, Hsin-Yi Wang wrote:
> Add katsu and katsu sku38 which uses different audio codec.
>
> Signed-off-by: Hsin-Yi Wang <[email protected]>
> ---
> Documentation/devicetree/bindings/arm/mediatek.yaml | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/mediatek.yaml b/Documentation/devicetree/bindings/arm/mediatek.yaml
> index a5999b3afc35..fe8c488a3207 100644
> --- a/Documentation/devicetree/bindings/arm/mediatek.yaml
> +++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
> @@ -235,6 +235,12 @@ properties:
> items:
> - const: google,kappa
> - const: mediatek,mt8183
> + - description: Google Katsu (ASUS Chromebook Detachable CZ1)
> + items:
> + - enum:
> + - google,katsu
> + - google,katsu-sku38
This seems a little odd - does the non sku38 not have an sku of its own?
> + - const: mediatek,mt8183
> - description: Google Kodama (Lenovo 10e Chromebook Tablet)
> items:
> - enum:
> --
> 2.42.0.758.gaed0368e0e-goog
>
On Mon, Oct 23, 2023 at 05:02:26PM -0700, Hsin-Yi Wang wrote:
> Add makomo sku0 and sku1 which uses different audio codec.
>
> Signed-off-by: Hsin-Yi Wang <[email protected]>
> ---
> Documentation/devicetree/bindings/arm/mediatek.yaml | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/mediatek.yaml b/Documentation/devicetree/bindings/arm/mediatek.yaml
> index fe8c488a3207..b131e0bdbf01 100644
> --- a/Documentation/devicetree/bindings/arm/mediatek.yaml
> +++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
> @@ -250,6 +250,18 @@ properties:
> - google,kodama-sku32
> - const: google,kodama
> - const: mediatek,mt8183
> + - description: Google Makomo (Lenovo 100e Chromebook 2nd Gen MTK 2)
> + items:
> + - const: google,makomo-rev4-sku0
> + - const: google,makomo-rev5-sku0
With these bindings, how does one describe a makomo-rev5-sku0?
What you have here is only suitable for describing the makomo-rev4-sku0.
Cheers,
Conor.
> + - const: google,makomo
> + - const: mediatek,mt8183
> + - description: Google Makomo (Lenovo 100e Chromebook 2nd Gen MTK 2)
> + items:
> + - const: google,makomo-rev4-sku1
> + - const: google,makomo-rev5-sku1
> + - const: google,makomo
> + - const: mediatek,mt8183
> - description: Google Willow (Acer Chromebook 311 C722/C722T)
> items:
> - enum:
> --
> 2.42.0.758.gaed0368e0e-goog
>
On 24/10/2023 02:02, Hsin-Yi Wang wrote:
> pico is also known as Acer Chromebook Spin 311.
>
> Signed-off-by: Hsin-Yi Wang <[email protected]>
> ---
...
> +&wifi_pwrseq {
> + post-power-on-delay-ms = <50>;
> +
> + /* Toggle WIFI_ENABLE to reset the chip. */
> + reset-gpios = <&pio 8 1>;
Use proper defines.
> +};
> +
> +&wifi_pins_pwrseq {
> + pins_wifi_enable {
No underscores in node names.
Best regards,
Krzysztof
On 24/10/2023 02:02, Hsin-Yi Wang wrote:
> makomo is also known as Lenovo 100e Chromebook 2nd Gen MTK 2.
>
> Signed-off-by: Hsin-Yi Wang <[email protected]>
> ---
> .../mt8183-kukui-jacuzzi-makomo-sku0.dts | 25 +++++++++++++++++++
> .../mt8183-kukui-jacuzzi-makomo-sku1.dts | 25 +++++++++++++++++++
> 2 files changed, 50 insertions(+)
> +
> +&qca_wifi {
> + qcom,ath10k-calibration-variant = "GO_FENNEL14";
> +};
> +
> +&mmc1_pins_uhs {
> + pins_clk {
No underscores in node names.
Best regards,
Krzysztof
On Tue, Oct 24, 2023 at 8:17 AM Conor Dooley <[email protected]> wrote:
>
> On Mon, Oct 23, 2023 at 05:02:26PM -0700, Hsin-Yi Wang wrote:
> > Add makomo sku0 and sku1 which uses different audio codec.
> >
> > Signed-off-by: Hsin-Yi Wang <[email protected]>
> > ---
> > Documentation/devicetree/bindings/arm/mediatek.yaml | 12 ++++++++++++
> > 1 file changed, 12 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/arm/mediatek.yaml b/Documentation/devicetree/bindings/arm/mediatek.yaml
> > index fe8c488a3207..b131e0bdbf01 100644
> > --- a/Documentation/devicetree/bindings/arm/mediatek.yaml
> > +++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
> > @@ -250,6 +250,18 @@ properties:
> > - google,kodama-sku32
> > - const: google,kodama
> > - const: mediatek,mt8183
> > + - description: Google Makomo (Lenovo 100e Chromebook 2nd Gen MTK 2)
> > + items:
> > + - const: google,makomo-rev4-sku0
> > + - const: google,makomo-rev5-sku0
>
> With these bindings, how does one describe a makomo-rev5-sku0?
> What you have here is only suitable for describing the makomo-rev4-sku0.
>
makomo-rev5-sku0 and makomo-rev4-sku0 uses the same dts:
compatible = "google,makomo-rev4-sku0", "google,makomo-rev5-sku0",
"google,makomo", "mediatek,mt8183";
In this case, can bindings be listed like that?
> Cheers,
> Conor.
>
> > + - const: google,makomo
> > + - const: mediatek,mt8183
> > + - description: Google Makomo (Lenovo 100e Chromebook 2nd Gen MTK 2)
> > + items:
> > + - const: google,makomo-rev4-sku1
> > + - const: google,makomo-rev5-sku1
> > + - const: google,makomo
> > + - const: mediatek,mt8183
> > - description: Google Willow (Acer Chromebook 311 C722/C722T)
> > items:
> > - enum:
> > --
> > 2.42.0.758.gaed0368e0e-goog
> >
On Tue, Oct 24, 2023 at 8:15 AM Conor Dooley <[email protected]> wrote:
>
> On Mon, Oct 23, 2023 at 05:02:24PM -0700, Hsin-Yi Wang wrote:
> > Add katsu and katsu sku38 which uses different audio codec.
> >
> > Signed-off-by: Hsin-Yi Wang <[email protected]>
> > ---
> > Documentation/devicetree/bindings/arm/mediatek.yaml | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/arm/mediatek.yaml b/Documentation/devicetree/bindings/arm/mediatek.yaml
> > index a5999b3afc35..fe8c488a3207 100644
> > --- a/Documentation/devicetree/bindings/arm/mediatek.yaml
> > +++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
> > @@ -235,6 +235,12 @@ properties:
> > items:
> > - const: google,kappa
> > - const: mediatek,mt8183
> > + - description: Google Katsu (ASUS Chromebook Detachable CZ1)
> > + items:
> > + - enum:
> > + - google,katsu
> > + - google,katsu-sku38
>
> This seems a little odd - does the non sku38 not have an sku of its own?
>
It's actually sku32. I'll update that in the next version. Thanks.
> > + - const: mediatek,mt8183
> > - description: Google Kodama (Lenovo 10e Chromebook Tablet)
> > items:
> > - enum:
> > --
> > 2.42.0.758.gaed0368e0e-goog
> >
On Tue, Oct 24, 2023 at 11:22:00AM -0700, Hsin-Yi Wang wrote:
> On Tue, Oct 24, 2023 at 8:17 AM Conor Dooley <[email protected]> wrote:
> >
> > On Mon, Oct 23, 2023 at 05:02:26PM -0700, Hsin-Yi Wang wrote:
> > > Add makomo sku0 and sku1 which uses different audio codec.
> > >
> > > Signed-off-by: Hsin-Yi Wang <[email protected]>
> > > ---
> > > Documentation/devicetree/bindings/arm/mediatek.yaml | 12 ++++++++++++
> > > 1 file changed, 12 insertions(+)
> > >
> > > diff --git a/Documentation/devicetree/bindings/arm/mediatek.yaml b/Documentation/devicetree/bindings/arm/mediatek.yaml
> > > index fe8c488a3207..b131e0bdbf01 100644
> > > --- a/Documentation/devicetree/bindings/arm/mediatek.yaml
> > > +++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
> > > @@ -250,6 +250,18 @@ properties:
> > > - google,kodama-sku32
> > > - const: google,kodama
> > > - const: mediatek,mt8183
> > > + - description: Google Makomo (Lenovo 100e Chromebook 2nd Gen MTK 2)
> > > + items:
> > > + - const: google,makomo-rev4-sku0
> > > + - const: google,makomo-rev5-sku0
> >
> > With these bindings, how does one describe a makomo-rev5-sku0?
> > What you have here is only suitable for describing the makomo-rev4-sku0.
> >
> makomo-rev5-sku0 and makomo-rev4-sku0 uses the same dts:
>
> compatible = "google,makomo-rev4-sku0", "google,makomo-rev5-sku0",
> "google,makomo", "mediatek,mt8183";
>
> In this case, can bindings be listed like that?
On a rev5-sku0, the first compatible should be the most specific one,
which would mean:
compatible = "google,makomo-rev5-sku0", "google,makomo", "mediatek,mt8183";
I said the same on other google laptop bindings before, but I'm not
really happy with these compatible configurations, that seem conjured up
to suit your firmware. It'd make far more sense to me to have a setup
that permitted:
compatible = "google,makomo-sku0-rev5", "google,makomo-sku0", "google,makomo", "mediatek,mt8183";
and
compatible = "google,makomo-sku0-rev4", "google,makomo-sku0", "google,makomo", "mediatek,mt8183";
Cheers,
Conor.
> > > + - const: google,makomo
> > > + - const: mediatek,mt8183
> > > + - description: Google Makomo (Lenovo 100e Chromebook 2nd Gen MTK 2)
> > > + items:
> > > + - const: google,makomo-rev4-sku1
> > > + - const: google,makomo-rev5-sku1
> > > + - const: google,makomo
> > > + - const: mediatek,mt8183
> > > - description: Google Willow (Acer Chromebook 311 C722/C722T)
> > > items:
> > > - enum:
> > > --
> > > 2.42.0.758.gaed0368e0e-goog
> > >
On 24/10/2023 20:22, Hsin-Yi Wang wrote:
> On Tue, Oct 24, 2023 at 8:17 AM Conor Dooley <[email protected]> wrote:
>>
>> On Mon, Oct 23, 2023 at 05:02:26PM -0700, Hsin-Yi Wang wrote:
>>> Add makomo sku0 and sku1 which uses different audio codec.
>>>
>>> Signed-off-by: Hsin-Yi Wang <[email protected]>
>>> ---
>>> Documentation/devicetree/bindings/arm/mediatek.yaml | 12 ++++++++++++
>>> 1 file changed, 12 insertions(+)
>>>
>>> diff --git a/Documentation/devicetree/bindings/arm/mediatek.yaml b/Documentation/devicetree/bindings/arm/mediatek.yaml
>>> index fe8c488a3207..b131e0bdbf01 100644
>>> --- a/Documentation/devicetree/bindings/arm/mediatek.yaml
>>> +++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
>>> @@ -250,6 +250,18 @@ properties:
>>> - google,kodama-sku32
>>> - const: google,kodama
>>> - const: mediatek,mt8183
>>> + - description: Google Makomo (Lenovo 100e Chromebook 2nd Gen MTK 2)
>>> + items:
>>> + - const: google,makomo-rev4-sku0
>>> + - const: google,makomo-rev5-sku0
>>
>> With these bindings, how does one describe a makomo-rev5-sku0?
>> What you have here is only suitable for describing the makomo-rev4-sku0.
>>
> makomo-rev5-sku0 and makomo-rev4-sku0 uses the same dts:
>
> compatible = "google,makomo-rev4-sku0", "google,makomo-rev5-sku0",
> "google,makomo", "mediatek,mt8183";
>
> In this case, can bindings be listed like that?
If they use the same DTS, then I would expect rev5 (as newer model, more
specific) followed by rev4 (older).
Best regards,
Krzysztof
On Wed, Oct 25, 2023 at 7:49 AM Conor Dooley <[email protected]> wrote:
>
> On Tue, Oct 24, 2023 at 11:22:00AM -0700, Hsin-Yi Wang wrote:
> > On Tue, Oct 24, 2023 at 8:17 AM Conor Dooley <[email protected]> wrote:
> > >
> > > On Mon, Oct 23, 2023 at 05:02:26PM -0700, Hsin-Yi Wang wrote:
> > > > Add makomo sku0 and sku1 which uses different audio codec.
> > > >
> > > > Signed-off-by: Hsin-Yi Wang <[email protected]>
> > > > ---
> > > > Documentation/devicetree/bindings/arm/mediatek.yaml | 12 ++++++++++++
> > > > 1 file changed, 12 insertions(+)
> > > >
> > > > diff --git a/Documentation/devicetree/bindings/arm/mediatek.yaml b/Documentation/devicetree/bindings/arm/mediatek.yaml
> > > > index fe8c488a3207..b131e0bdbf01 100644
> > > > --- a/Documentation/devicetree/bindings/arm/mediatek.yaml
> > > > +++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
> > > > @@ -250,6 +250,18 @@ properties:
> > > > - google,kodama-sku32
> > > > - const: google,kodama
> > > > - const: mediatek,mt8183
> > > > + - description: Google Makomo (Lenovo 100e Chromebook 2nd Gen MTK 2)
> > > > + items:
> > > > + - const: google,makomo-rev4-sku0
> > > > + - const: google,makomo-rev5-sku0
> > >
> > > With these bindings, how does one describe a makomo-rev5-sku0?
> > > What you have here is only suitable for describing the makomo-rev4-sku0.
> > >
> > makomo-rev5-sku0 and makomo-rev4-sku0 uses the same dts:
> >
> > compatible = "google,makomo-rev4-sku0", "google,makomo-rev5-sku0",
> > "google,makomo", "mediatek,mt8183";
> >
> > In this case, can bindings be listed like that?
>
> On a rev5-sku0, the first compatible should be the most specific one,
> which would mean:
>
> compatible = "google,makomo-rev5-sku0", "google,makomo", "mediatek,mt8183";
>
> I said the same on other google laptop bindings before, but I'm not
> really happy with these compatible configurations, that seem conjured up
> to suit your firmware. It'd make far more sense to me to have a setup
> that permitted:
> compatible = "google,makomo-sku0-rev5", "google,makomo-sku0", "google,makomo", "mediatek,mt8183";
> and
> compatible = "google,makomo-sku0-rev4", "google,makomo-sku0", "google,makomo", "mediatek,mt8183";
>
The actual compatible is like:
google,makomo-rev4-sku1 google,makomo-sku1 google,makomo-rev4 google,makomo
So I think I can remove the rev here, and just let them match with
google,makomo-skuX, since rev4/rev5 share the same dts.
> Cheers,
> Conor.
>
> > > > + - const: google,makomo
> > > > + - const: mediatek,mt8183
> > > > + - description: Google Makomo (Lenovo 100e Chromebook 2nd Gen MTK 2)
> > > > + items:
> > > > + - const: google,makomo-rev4-sku1
> > > > + - const: google,makomo-rev5-sku1
> > > > + - const: google,makomo
> > > > + - const: mediatek,mt8183
> > > > - description: Google Willow (Acer Chromebook 311 C722/C722T)
> > > > items:
> > > > - enum:
> > > > --
> > > > 2.42.0.758.gaed0368e0e-goog
> > > >