* [PATCH v3 1/7] arm64: dts: mt8183: kukui: Fix underscores in node names
2023-10-25 21:48 [PATCH v3 0/7] Add a few mt8183 follower boards Hsin-Yi Wang
@ 2023-10-25 21:48 ` Hsin-Yi Wang
2023-10-26 8:13 ` AngeloGioacchino Del Regno
2023-10-25 21:48 ` [PATCH v3 2/7] dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-katsu Hsin-Yi Wang
` (6 subsequent siblings)
7 siblings, 1 reply; 13+ messages in thread
From: Hsin-Yi Wang @ 2023-10-25 21:48 UTC (permalink / raw)
To: Matthias Brugger, AngeloGioacchino Del Regno, Krzysztof Kozlowski
Cc: Rob Herring, Conor Dooley, Nícolas F . R . A . Prado,
Bernhard Rosenkränzer, Macpaul Lin, Sean Wang, devicetree,
linux-kernel, linux-arm-kernel, linux-mediatek
Replace underscores with hyphens in pinctrl node names both for consistency
and to adhere to the bindings.
Fixes: cd894e274b74 ("arm64: dts: mt8183: Add krane-sku176 board")
Fixes: 1652dbf7363a ("arm64: dts: mt8183: add scp node")
Fixes: 27eaf34df364 ("arm64: dts: mt8183: config dsi node")
Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
---
v2->v3: Update commit message. Add Fixes tags.
---
.../dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 6 +-
.../arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 94 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi
index bf97b60ae4d1..06fde1a9aab7 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi
@@ -441,20 +441,20 @@ pins2 {
};
touchscreen_pins: touchscreen-pins {
- touch_int_odl {
+ touch-int-odl {
pinmux = <PINMUX_GPIO155__FUNC_GPIO155>;
input-enable;
bias-pull-up;
};
- touch_rst_l {
+ touch-rst-l {
pinmux = <PINMUX_GPIO156__FUNC_GPIO156>;
output-high;
};
};
trackpad_pins: trackpad-pins {
- trackpad_int {
+ trackpad-int {
pinmux = <PINMUX_GPIO7__FUNC_GPIO7>;
input-enable;
bias-disable; /* pulled externally */
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
index bf7de35ffcbc..4ff207ab1d26 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
@@ -460,7 +460,7 @@ &mt6358_vsram_gpu_reg {
&pio {
aud_pins_default: audiopins {
- pins_bus {
+ pins-bus {
pinmux = <PINMUX_GPIO97__FUNC_I2S2_MCK>,
<PINMUX_GPIO98__FUNC_I2S2_BCK>,
<PINMUX_GPIO101__FUNC_I2S2_LRCK>,
@@ -482,7 +482,7 @@ pins_bus {
};
aud_pins_tdm_out_on: audiotdmouton {
- pins_bus {
+ pins-bus {
pinmux = <PINMUX_GPIO169__FUNC_TDM_BCK_2ND>,
<PINMUX_GPIO170__FUNC_TDM_LRCK_2ND>,
<PINMUX_GPIO171__FUNC_TDM_DATA0_2ND>,
@@ -494,7 +494,7 @@ pins_bus {
};
aud_pins_tdm_out_off: audiotdmoutoff {
- pins_bus {
+ pins-bus {
pinmux = <PINMUX_GPIO169__FUNC_GPIO169>,
<PINMUX_GPIO170__FUNC_GPIO170>,
<PINMUX_GPIO171__FUNC_GPIO171>,
@@ -508,13 +508,13 @@ pins_bus {
};
bt_pins: bt-pins {
- pins_bt_en {
+ pins-bt-en {
pinmux = <PINMUX_GPIO120__FUNC_GPIO120>;
output-low;
};
};
- ec_ap_int_odl: ec_ap_int_odl {
+ ec_ap_int_odl: ec-ap-int-odl {
pins1 {
pinmux = <PINMUX_GPIO151__FUNC_GPIO151>;
input-enable;
@@ -522,7 +522,7 @@ pins1 {
};
};
- h1_int_od_l: h1_int_od_l {
+ h1_int_od_l: h1-int-od-l {
pins1 {
pinmux = <PINMUX_GPIO153__FUNC_GPIO153>;
input-enable;
@@ -530,7 +530,7 @@ pins1 {
};
i2c0_pins: i2c0 {
- pins_bus {
+ pins-bus {
pinmux = <PINMUX_GPIO82__FUNC_SDA0>,
<PINMUX_GPIO83__FUNC_SCL0>;
mediatek,pull-up-adv = <3>;
@@ -539,7 +539,7 @@ pins_bus {
};
i2c1_pins: i2c1 {
- pins_bus {
+ pins-bus {
pinmux = <PINMUX_GPIO81__FUNC_SDA1>,
<PINMUX_GPIO84__FUNC_SCL1>;
mediatek,pull-up-adv = <3>;
@@ -548,7 +548,7 @@ pins_bus {
};
i2c2_pins: i2c2 {
- pins_bus {
+ pins-bus {
pinmux = <PINMUX_GPIO103__FUNC_SCL2>,
<PINMUX_GPIO104__FUNC_SDA2>;
bias-disable;
@@ -557,7 +557,7 @@ pins_bus {
};
i2c3_pins: i2c3 {
- pins_bus {
+ pins-bus {
pinmux = <PINMUX_GPIO50__FUNC_SCL3>,
<PINMUX_GPIO51__FUNC_SDA3>;
mediatek,pull-up-adv = <3>;
@@ -566,7 +566,7 @@ pins_bus {
};
i2c4_pins: i2c4 {
- pins_bus {
+ pins-bus {
pinmux = <PINMUX_GPIO105__FUNC_SCL4>,
<PINMUX_GPIO106__FUNC_SDA4>;
bias-disable;
@@ -575,7 +575,7 @@ pins_bus {
};
i2c5_pins: i2c5 {
- pins_bus {
+ pins-bus {
pinmux = <PINMUX_GPIO48__FUNC_SCL5>,
<PINMUX_GPIO49__FUNC_SDA5>;
mediatek,pull-up-adv = <3>;
@@ -584,7 +584,7 @@ pins_bus {
};
i2c6_pins: i2c6 {
- pins_bus {
+ pins-bus {
pinmux = <PINMUX_GPIO11__FUNC_SCL6>,
<PINMUX_GPIO12__FUNC_SDA6>;
bias-disable;
@@ -592,7 +592,7 @@ pins_bus {
};
mmc0_pins_default: mmc0-pins-default {
- pins_cmd_dat {
+ pins-cmd-dat {
pinmux = <PINMUX_GPIO123__FUNC_MSDC0_DAT0>,
<PINMUX_GPIO128__FUNC_MSDC0_DAT1>,
<PINMUX_GPIO125__FUNC_MSDC0_DAT2>,
@@ -607,13 +607,13 @@ pins_cmd_dat {
mediatek,pull-up-adv = <01>;
};
- pins_clk {
+ pins-clk {
pinmux = <PINMUX_GPIO124__FUNC_MSDC0_CLK>;
drive-strength = <MTK_DRIVE_14mA>;
mediatek,pull-down-adv = <10>;
};
- pins_rst {
+ pins-rst {
pinmux = <PINMUX_GPIO133__FUNC_MSDC0_RSTB>;
drive-strength = <MTK_DRIVE_14mA>;
mediatek,pull-down-adv = <01>;
@@ -621,7 +621,7 @@ pins_rst {
};
mmc0_pins_uhs: mmc0-pins-uhs {
- pins_cmd_dat {
+ pins-cmd-dat {
pinmux = <PINMUX_GPIO123__FUNC_MSDC0_DAT0>,
<PINMUX_GPIO128__FUNC_MSDC0_DAT1>,
<PINMUX_GPIO125__FUNC_MSDC0_DAT2>,
@@ -636,19 +636,19 @@ pins_cmd_dat {
mediatek,pull-up-adv = <01>;
};
- pins_clk {
+ pins-clk {
pinmux = <PINMUX_GPIO124__FUNC_MSDC0_CLK>;
drive-strength = <MTK_DRIVE_14mA>;
mediatek,pull-down-adv = <10>;
};
- pins_ds {
+ pins-ds {
pinmux = <PINMUX_GPIO131__FUNC_MSDC0_DSL>;
drive-strength = <MTK_DRIVE_14mA>;
mediatek,pull-down-adv = <10>;
};
- pins_rst {
+ pins-rst {
pinmux = <PINMUX_GPIO133__FUNC_MSDC0_RSTB>;
drive-strength = <MTK_DRIVE_14mA>;
mediatek,pull-up-adv = <01>;
@@ -656,7 +656,7 @@ pins_rst {
};
mmc1_pins_default: mmc1-pins-default {
- pins_cmd_dat {
+ pins-cmd-dat {
pinmux = <PINMUX_GPIO31__FUNC_MSDC1_CMD>,
<PINMUX_GPIO32__FUNC_MSDC1_DAT0>,
<PINMUX_GPIO34__FUNC_MSDC1_DAT1>,
@@ -666,7 +666,7 @@ pins_cmd_dat {
mediatek,pull-up-adv = <10>;
};
- pins_clk {
+ pins-clk {
pinmux = <PINMUX_GPIO29__FUNC_MSDC1_CLK>;
input-enable;
mediatek,pull-down-adv = <10>;
@@ -674,7 +674,7 @@ pins_clk {
};
mmc1_pins_uhs: mmc1-pins-uhs {
- pins_cmd_dat {
+ pins-cmd-dat {
pinmux = <PINMUX_GPIO31__FUNC_MSDC1_CMD>,
<PINMUX_GPIO32__FUNC_MSDC1_DAT0>,
<PINMUX_GPIO34__FUNC_MSDC1_DAT1>,
@@ -685,7 +685,7 @@ pins_cmd_dat {
mediatek,pull-up-adv = <10>;
};
- pins_clk {
+ pins-clk {
pinmux = <PINMUX_GPIO29__FUNC_MSDC1_CLK>;
drive-strength = <MTK_DRIVE_8mA>;
mediatek,pull-down-adv = <10>;
@@ -693,15 +693,15 @@ pins_clk {
};
};
- panel_pins_default: panel_pins_default {
- panel_reset {
+ panel_pins_default: panel-pins-default {
+ panel-reset {
pinmux = <PINMUX_GPIO45__FUNC_GPIO45>;
output-low;
bias-pull-up;
};
};
- pwm0_pin_default: pwm0_pin_default {
+ pwm0_pin_default: pwm0-pin-default {
pins1 {
pinmux = <PINMUX_GPIO176__FUNC_GPIO176>;
output-high;
@@ -713,14 +713,14 @@ pins2 {
};
scp_pins: scp {
- pins_scp_uart {
+ pins-scp-uart {
pinmux = <PINMUX_GPIO110__FUNC_TP_URXD1_AO>,
<PINMUX_GPIO112__FUNC_TP_UTXD1_AO>;
};
};
spi0_pins: spi0 {
- pins_spi {
+ pins-spi {
pinmux = <PINMUX_GPIO85__FUNC_SPI0_MI>,
<PINMUX_GPIO86__FUNC_GPIO86>,
<PINMUX_GPIO87__FUNC_SPI0_MO>,
@@ -730,7 +730,7 @@ pins_spi {
};
spi1_pins: spi1 {
- pins_spi {
+ pins-spi {
pinmux = <PINMUX_GPIO161__FUNC_SPI1_A_MI>,
<PINMUX_GPIO162__FUNC_SPI1_A_CSB>,
<PINMUX_GPIO163__FUNC_SPI1_A_MO>,
@@ -740,20 +740,20 @@ pins_spi {
};
spi2_pins: spi2 {
- pins_spi {
+ pins-spi {
pinmux = <PINMUX_GPIO0__FUNC_SPI2_CSB>,
<PINMUX_GPIO1__FUNC_SPI2_MO>,
<PINMUX_GPIO2__FUNC_SPI2_CLK>;
bias-disable;
};
- pins_spi_mi {
+ pins-spi-mi {
pinmux = <PINMUX_GPIO94__FUNC_SPI2_MI>;
mediatek,pull-down-adv = <00>;
};
};
spi3_pins: spi3 {
- pins_spi {
+ pins-spi {
pinmux = <PINMUX_GPIO21__FUNC_SPI3_MI>,
<PINMUX_GPIO22__FUNC_SPI3_CSB>,
<PINMUX_GPIO23__FUNC_SPI3_MO>,
@@ -763,7 +763,7 @@ pins_spi {
};
spi4_pins: spi4 {
- pins_spi {
+ pins-spi {
pinmux = <PINMUX_GPIO17__FUNC_SPI4_MI>,
<PINMUX_GPIO18__FUNC_SPI4_CSB>,
<PINMUX_GPIO19__FUNC_SPI4_MO>,
@@ -773,7 +773,7 @@ pins_spi {
};
spi5_pins: spi5 {
- pins_spi {
+ pins-spi {
pinmux = <PINMUX_GPIO13__FUNC_SPI5_MI>,
<PINMUX_GPIO14__FUNC_SPI5_CSB>,
<PINMUX_GPIO15__FUNC_SPI5_MO>,
@@ -783,63 +783,63 @@ pins_spi {
};
uart0_pins_default: uart0-pins-default {
- pins_rx {
+ pins-rx {
pinmux = <PINMUX_GPIO95__FUNC_URXD0>;
input-enable;
bias-pull-up;
};
- pins_tx {
+ pins-tx {
pinmux = <PINMUX_GPIO96__FUNC_UTXD0>;
};
};
uart1_pins_default: uart1-pins-default {
- pins_rx {
+ pins-rx {
pinmux = <PINMUX_GPIO121__FUNC_URXD1>;
input-enable;
bias-pull-up;
};
- pins_tx {
+ pins-tx {
pinmux = <PINMUX_GPIO115__FUNC_UTXD1>;
};
- pins_rts {
+ pins-rts {
pinmux = <PINMUX_GPIO47__FUNC_URTS1>;
output-enable;
};
- pins_cts {
+ pins-cts {
pinmux = <PINMUX_GPIO46__FUNC_UCTS1>;
input-enable;
};
};
uart1_pins_sleep: uart1-pins-sleep {
- pins_rx {
+ pins-rx {
pinmux = <PINMUX_GPIO121__FUNC_GPIO121>;
input-enable;
bias-pull-up;
};
- pins_tx {
+ pins-tx {
pinmux = <PINMUX_GPIO115__FUNC_UTXD1>;
};
- pins_rts {
+ pins-rts {
pinmux = <PINMUX_GPIO47__FUNC_URTS1>;
output-enable;
};
- pins_cts {
+ pins-cts {
pinmux = <PINMUX_GPIO46__FUNC_UCTS1>;
input-enable;
};
};
wifi_pins_pwrseq: wifi-pins-pwrseq {
- pins_wifi_enable {
+ pins-wifi-enable {
pinmux = <PINMUX_GPIO119__FUNC_GPIO119>;
output-low;
};
};
wifi_pins_wakeup: wifi-pins-wakeup {
- pins_wifi_wakeup {
+ pins-wifi-wakeup {
pinmux = <PINMUX_GPIO113__FUNC_GPIO113>;
input-enable;
};
--
2.42.0.758.gaed0368e0e-goog
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v3 1/7] arm64: dts: mt8183: kukui: Fix underscores in node names
2023-10-25 21:48 ` [PATCH v3 1/7] arm64: dts: mt8183: kukui: Fix underscores in node names Hsin-Yi Wang
@ 2023-10-26 8:13 ` AngeloGioacchino Del Regno
0 siblings, 0 replies; 13+ messages in thread
From: AngeloGioacchino Del Regno @ 2023-10-26 8:13 UTC (permalink / raw)
To: Hsin-Yi Wang, Matthias Brugger, Krzysztof Kozlowski
Cc: Rob Herring, Conor Dooley, Nícolas F . R . A . Prado,
Bernhard Rosenkränzer, Macpaul Lin, Sean Wang, devicetree,
linux-kernel, linux-arm-kernel, linux-mediatek
Il 25/10/23 23:48, Hsin-Yi Wang ha scritto:
> Replace underscores with hyphens in pinctrl node names both for consistency
> and to adhere to the bindings.
>
> Fixes: cd894e274b74 ("arm64: dts: mt8183: Add krane-sku176 board")
> Fixes: 1652dbf7363a ("arm64: dts: mt8183: add scp node")
> Fixes: 27eaf34df364 ("arm64: dts: mt8183: config dsi node")
> Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 2/7] dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-katsu
2023-10-25 21:48 [PATCH v3 0/7] Add a few mt8183 follower boards Hsin-Yi Wang
2023-10-25 21:48 ` [PATCH v3 1/7] arm64: dts: mt8183: kukui: Fix underscores in node names Hsin-Yi Wang
@ 2023-10-25 21:48 ` Hsin-Yi Wang
2023-10-26 14:32 ` Conor Dooley
2023-10-25 21:48 ` [PATCH v3 3/7] arm64: dts: mt8183: Add kukui katsu board Hsin-Yi Wang
` (5 subsequent siblings)
7 siblings, 1 reply; 13+ messages in thread
From: Hsin-Yi Wang @ 2023-10-25 21:48 UTC (permalink / raw)
To: Matthias Brugger, AngeloGioacchino Del Regno, Krzysztof Kozlowski
Cc: Rob Herring, Conor Dooley, Nícolas F . R . A . Prado,
Bernhard Rosenkränzer, Macpaul Lin, Sean Wang, devicetree,
linux-kernel, linux-arm-kernel, linux-mediatek
Add katsu sku32 and sku38 which uses different audio codec.
Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
---
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 a5999b3afc35..4fe58cfe6f1b 100644
--- a/Documentation/devicetree/bindings/arm/mediatek.yaml
+++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
@@ -235,6 +235,13 @@ properties:
items:
- const: google,kappa
- const: mediatek,mt8183
+ - description: Google Katsu (ASUS Chromebook Detachable CZ1)
+ items:
+ - enum:
+ - google,katsu-sku32
+ - google,katsu-sku38
+ - const: google,katsu
+ - const: mediatek,mt8183
- description: Google Kodama (Lenovo 10e Chromebook Tablet)
items:
- enum:
--
2.42.0.758.gaed0368e0e-goog
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v3 2/7] dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-katsu
2023-10-25 21:48 ` [PATCH v3 2/7] dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-katsu Hsin-Yi Wang
@ 2023-10-26 14:32 ` Conor Dooley
0 siblings, 0 replies; 13+ messages in thread
From: Conor Dooley @ 2023-10-26 14:32 UTC (permalink / raw)
To: Hsin-Yi Wang
Cc: Matthias Brugger, AngeloGioacchino Del Regno, Krzysztof Kozlowski,
Rob Herring, Conor Dooley, Nícolas F . R . A . Prado,
Bernhard Rosenkränzer, Macpaul Lin, Sean Wang, devicetree,
linux-kernel, linux-arm-kernel, linux-mediatek
[-- Attachment #1: Type: text/plain, Size: 1328 bytes --]
Yo,
For your subject, drop the "dts: ", that as this is a patch for a
dt-binding, not a devicetree source file.
On Wed, Oct 25, 2023 at 02:48:44PM -0700, Hsin-Yi Wang wrote:
> Add katsu sku32 and sku38 which uses different audio codec.
>
> Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
> ---
> 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 a5999b3afc35..4fe58cfe6f1b 100644
> --- a/Documentation/devicetree/bindings/arm/mediatek.yaml
> +++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
> @@ -235,6 +235,13 @@ properties:
> items:
> - const: google,kappa
> - const: mediatek,mt8183
> + - description: Google Katsu (ASUS Chromebook Detachable CZ1)
> + items:
> + - enum:
> + - google,katsu-sku32
> + - google,katsu-sku38
> + - const: google,katsu
> + - const: mediatek,mt8183
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Thanks,
Conor.
> - description: Google Kodama (Lenovo 10e Chromebook Tablet)
> items:
> - enum:
> --
> 2.42.0.758.gaed0368e0e-goog
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 3/7] arm64: dts: mt8183: Add kukui katsu board
2023-10-25 21:48 [PATCH v3 0/7] Add a few mt8183 follower boards Hsin-Yi Wang
2023-10-25 21:48 ` [PATCH v3 1/7] arm64: dts: mt8183: kukui: Fix underscores in node names Hsin-Yi Wang
2023-10-25 21:48 ` [PATCH v3 2/7] dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-katsu Hsin-Yi Wang
@ 2023-10-25 21:48 ` Hsin-Yi Wang
2023-10-25 21:48 ` [PATCH v3 4/7] dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-jacuzzi-makomo Hsin-Yi Wang
` (4 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Hsin-Yi Wang @ 2023-10-25 21:48 UTC (permalink / raw)
To: Matthias Brugger, AngeloGioacchino Del Regno, Krzysztof Kozlowski
Cc: Rob Herring, Conor Dooley, Nícolas F . R . A . Prado,
Bernhard Rosenkränzer, Macpaul Lin, Sean Wang, devicetree,
linux-kernel, linux-arm-kernel, linux-mediatek
katsu is also known as ASUS Chromebook Detachable CZ1.
Let katsu and kakadu set its own touchscreen and panel compatible. Remove
these setting from the common dtsi for readability.
Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
---
v2->v3: clean up panel and touchscreen.
---
arch/arm64/boot/dts/mediatek/Makefile | 2 +
.../mediatek/mt8183-kukui-kakadu-sku22.dts | 18 +++++++++
.../boot/dts/mediatek/mt8183-kukui-kakadu.dts | 18 +++++++++
.../dts/mediatek/mt8183-kukui-kakadu.dtsi | 15 +------
.../dts/mediatek/mt8183-kukui-katsu-sku32.dts | 36 +++++++++++++++++
.../dts/mediatek/mt8183-kukui-katsu-sku38.dts | 40 +++++++++++++++++++
6 files changed, 115 insertions(+), 14 deletions(-)
create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts
create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts
diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile
index e6e7592a3645..a13419e67e8e 100644
--- a/arch/arm64/boot/dts/mediatek/Makefile
+++ b/arch/arm64/boot/dts/mediatek/Makefile
@@ -36,6 +36,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-willow-sku0.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-willow-sku1.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kakadu.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kakadu-sku22.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-katsu-sku32.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-katsu-sku38.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kodama-sku16.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kodama-sku272.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kodama-sku288.dtb
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-sku22.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-sku22.dts
index fcce8ea1232e..1ecf39458d93 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-sku22.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-sku22.dts
@@ -14,6 +14,24 @@ / {
"google,kakadu", "mediatek,mt8183";
};
+&i2c0 {
+ touchscreen: touchscreen@10 {
+ compatible = "hid-over-i2c";
+ reg = <0x10>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&open_touch>;
+
+ interrupts-extended = <&pio 155 IRQ_TYPE_EDGE_FALLING>;
+
+ post-power-on-delay-ms = <10>;
+ hid-descr-addr = <0x0001>;
+ };
+};
+
+&panel {
+ compatible = "boe,tv105wum-nw0";
+};
+
&sound {
compatible = "mediatek,mt8183_mt6358_ts3a227_rt1015p";
};
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dts
index ebfabba72507..ba74109a4909 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dts
@@ -13,3 +13,21 @@ / {
compatible = "google,kakadu-rev3", "google,kakadu-rev2",
"google,kakadu", "mediatek,mt8183";
};
+
+&i2c0 {
+ touchscreen: touchscreen@10 {
+ compatible = "hid-over-i2c";
+ reg = <0x10>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&open_touch>;
+
+ interrupts-extended = <&pio 155 IRQ_TYPE_EDGE_FALLING>;
+
+ post-power-on-delay-ms = <10>;
+ hid-descr-addr = <0x0001>;
+ };
+};
+
+&panel {
+ compatible = "boe,tv105wum-nw0";
+};
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi
index a11adeb29b1f..b6a9830af269 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi
@@ -63,19 +63,6 @@ &bluetooth {
&i2c0 {
status = "okay";
-
- touchscreen: touchscreen@10 {
- compatible = "hid-over-i2c";
- reg = <0x10>;
- pinctrl-names = "default";
- pinctrl-0 = <&open_touch>;
-
- interrupt-parent = <&pio>;
- interrupts = <155 IRQ_TYPE_EDGE_FALLING>;
-
- post-power-on-delay-ms = <10>;
- hid-descr-addr = <0x0001>;
- };
};
&mt6358_vcama2_reg {
@@ -384,5 +371,5 @@ &qca_wifi {
&panel {
status = "okay";
- compatible = "boe,tv105wum-nw0";
+ /* compatible will be set in board dts */
};
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts
new file mode 100644
index 000000000000..05361008e8ac
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts
@@ -0,0 +1,36 @@
+// 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-sku32", "google,katsu", "mediatek,mt8183";
+};
+
+&i2c0 {
+ touchscreen1: touchscreen@5d {
+ compatible = "goodix,gt7375p";
+ reg = <0x5d>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&open_touch>;
+
+ interrupts-extended = <&pio 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";
+};
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..cf008ed82878
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.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-rt1015p.dtsi"
+
+/ {
+ model = "Google katsu sku38 board";
+ chassis-type = "tablet";
+ compatible = "google,katsu-sku38", "google,katsu", "mediatek,mt8183";
+};
+
+&i2c0 {
+ touchscreen1: touchscreen@5d {
+ compatible = "goodix,gt7375p";
+ reg = <0x5d>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&open_touch>;
+
+ interrupts-extended = <&pio 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";
+};
--
2.42.0.758.gaed0368e0e-goog
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v3 4/7] dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-jacuzzi-makomo
2023-10-25 21:48 [PATCH v3 0/7] Add a few mt8183 follower boards Hsin-Yi Wang
` (2 preceding siblings ...)
2023-10-25 21:48 ` [PATCH v3 3/7] arm64: dts: mt8183: Add kukui katsu board Hsin-Yi Wang
@ 2023-10-25 21:48 ` Hsin-Yi Wang
2023-10-26 12:38 ` Rob Herring
2023-10-26 14:36 ` Conor Dooley
2023-10-25 21:48 ` [PATCH v3 5/7] arm64: dts: mt8183: Add jacuzzi makomo board Hsin-Yi Wang
` (3 subsequent siblings)
7 siblings, 2 replies; 13+ messages in thread
From: Hsin-Yi Wang @ 2023-10-25 21:48 UTC (permalink / raw)
To: Matthias Brugger, AngeloGioacchino Del Regno, Krzysztof Kozlowski
Cc: Rob Herring, Conor Dooley, Nícolas F . R . A . Prado,
Bernhard Rosenkränzer, Macpaul Lin, Sean Wang, devicetree,
linux-kernel, linux-arm-kernel, linux-mediatek
Add makomo sku0 and sku1 which uses different audio codec.
Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
---
v2->v3: remove rev since match on sku is sufficient.
---
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 4fe58cfe6f1b..54141b9bb714 100644
--- a/Documentation/devicetree/bindings/arm/mediatek.yaml
+++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
@@ -251,6 +251,13 @@ properties:
- google,kodama-sku32
- const: google,kodama
- const: mediatek,mt8183
+ - description: Google Makomo (Lenovo 100e Chromebook 2nd Gen MTK 2)
+ items:
+ - enum:
+ - const: google,makomo-sku0
+ - const: google,makomo-sku1
+ - const: google,makomo
+ - const: mediatek,mt8183
- description: Google Willow (Acer Chromebook 311 C722/C722T)
items:
- enum:
--
2.42.0.758.gaed0368e0e-goog
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v3 4/7] dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-jacuzzi-makomo
2023-10-25 21:48 ` [PATCH v3 4/7] dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-jacuzzi-makomo Hsin-Yi Wang
@ 2023-10-26 12:38 ` Rob Herring
2023-10-26 14:36 ` Conor Dooley
1 sibling, 0 replies; 13+ messages in thread
From: Rob Herring @ 2023-10-26 12:38 UTC (permalink / raw)
To: Hsin-Yi Wang
Cc: Matthias Brugger, Nícolas F . R . A . Prado, Sean Wang,
Rob Herring, Krzysztof Kozlowski, linux-kernel, linux-arm-kernel,
AngeloGioacchino Del Regno, Conor Dooley, linux-mediatek,
devicetree, Bernhard Rosenkränzer, Macpaul Lin
On Wed, 25 Oct 2023 14:48:46 -0700, Hsin-Yi Wang wrote:
> Add makomo sku0 and sku1 which uses different audio codec.
>
> Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
> ---
> v2->v3: remove rev since match on sku is sufficient.
> ---
> Documentation/devicetree/bindings/arm/mediatek.yaml | 7 +++++++
> 1 file changed, 7 insertions(+)
>
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
dtschema/dtc warnings/errors:
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/arm/mediatek.yaml: properties:compatible:oneOf:42:items: 'oneOf' conditional failed, one must be fixed:
[{'enum': [{'const': 'google,makomo-sku0'}, {'const': 'google,makomo-sku1'}]}, {'const': 'google,makomo'}, {'const': 'mediatek,mt8183'}] is not of type 'object'
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/arm/mediatek.yaml: properties:compatible:oneOf:42:items:0:enum: 'oneOf' conditional failed, one must be fixed:
{'const': 'google,makomo-sku0'} is not of type 'integer'
{'const': 'google,makomo-sku0'} is not of type 'string'
{'const': 'google,makomo-sku1'} is not of type 'integer'
{'const': 'google,makomo-sku1'} is not of type 'string'
hint: "enum" must be an array of either integers or strings
from schema $id: http://devicetree.org/meta-schemas/keywords.yaml#
from schema $id: http://devicetree.org/meta-schemas/keywords.yaml#
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/arm/mediatek.yaml: properties:compatible:oneOf:42:items: 'oneOf' conditional failed, one must be fixed:
[{'enum': [{'const': 'google,makomo-sku0'}, {'const': 'google,makomo-sku1'}]}, {'const': 'google,makomo'}, {'const': 'mediatek,mt8183'}] is not of type 'object'
{'const': 'google,makomo-sku0'} is not of type 'string'
{'const': 'google,makomo-sku1'} is not of type 'string'
from schema $id: http://devicetree.org/meta-schemas/string-array.yaml#
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20231025215517.1388735-5-hsinyi@chromium.org
The base for the series is generally the latest rc1. A different dependency
should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note
that DT_SCHEMA_FILES can be set to your schema file to speed up checking
your schema. However, it must be unset to test all examples with your schema.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH v3 4/7] dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-jacuzzi-makomo
2023-10-25 21:48 ` [PATCH v3 4/7] dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-jacuzzi-makomo Hsin-Yi Wang
2023-10-26 12:38 ` Rob Herring
@ 2023-10-26 14:36 ` Conor Dooley
1 sibling, 0 replies; 13+ messages in thread
From: Conor Dooley @ 2023-10-26 14:36 UTC (permalink / raw)
To: Hsin-Yi Wang
Cc: Matthias Brugger, AngeloGioacchino Del Regno, Krzysztof Kozlowski,
Rob Herring, Conor Dooley, Nícolas F . R . A . Prado,
Bernhard Rosenkränzer, Macpaul Lin, Sean Wang, devicetree,
linux-kernel, linux-arm-kernel, linux-mediatek
[-- Attachment #1: Type: text/plain, Size: 1382 bytes --]
On Wed, Oct 25, 2023 at 02:48:46PM -0700, Hsin-Yi Wang wrote:
> Add makomo sku0 and sku1 which uses different audio codec.
>
> Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
> ---
> v2->v3: remove rev since match on sku is sufficient.
> ---
> 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 4fe58cfe6f1b..54141b9bb714 100644
> --- a/Documentation/devicetree/bindings/arm/mediatek.yaml
> +++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
> @@ -251,6 +251,13 @@ properties:
> - google,kodama-sku32
> - const: google,kodama
> - const: mediatek,mt8183
> + - description: Google Makomo (Lenovo 100e Chromebook 2nd Gen MTK 2)
> + items:
> + - enum:
> + - const: google,makomo-sku0
> + - const: google,makomo-sku1
s/const: // to fix the error reported by the bot.
With that,
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Thanks,
Conor.
> + - const: google,makomo
> + - const: mediatek,mt8183
> - description: Google Willow (Acer Chromebook 311 C722/C722T)
> items:
> - enum:
> --
> 2.42.0.758.gaed0368e0e-goog
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 5/7] arm64: dts: mt8183: Add jacuzzi makomo board
2023-10-25 21:48 [PATCH v3 0/7] Add a few mt8183 follower boards Hsin-Yi Wang
` (3 preceding siblings ...)
2023-10-25 21:48 ` [PATCH v3 4/7] dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-jacuzzi-makomo Hsin-Yi Wang
@ 2023-10-25 21:48 ` Hsin-Yi Wang
2023-10-25 21:48 ` [PATCH v3 6/7] dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-jacuzzi-pico Hsin-Yi Wang
` (2 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Hsin-Yi Wang @ 2023-10-25 21:48 UTC (permalink / raw)
To: Matthias Brugger, AngeloGioacchino Del Regno, Krzysztof Kozlowski
Cc: Rob Herring, Conor Dooley, Nícolas F . R . A . Prado,
Bernhard Rosenkränzer, Macpaul Lin, Sean Wang, devicetree,
linux-kernel, linux-arm-kernel, linux-mediatek
makomo is also known as Lenovo 100e Chromebook 2nd Gen MTK 2.
Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
---
v2->v3: remove rev since match on sku is sufficient.
---
arch/arm64/boot/dts/mediatek/Makefile | 2 ++
.../mt8183-kukui-jacuzzi-makomo-sku0.dts | 24 +++++++++++++++++++
.../mt8183-kukui-jacuzzi-makomo-sku1.dts | 24 +++++++++++++++++++
3 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/Makefile b/arch/arm64/boot/dts/mediatek/Makefile
index a13419e67e8e..1b85a8c12850 100644
--- a/arch/arm64/boot/dts/mediatek/Makefile
+++ b/arch/arm64/boot/dts/mediatek/Makefile
@@ -32,6 +32,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-fennel14-sku2.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-juniper-sku16.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-kappa.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-kenzo.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-makomo-sku0.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-makomo-sku1.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-willow-sku0.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-willow-sku1.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kakadu.dtb
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..4eb2a0d571af
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku0.dts
@@ -0,0 +1,24 @@
+// 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-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..6a733361e8ae
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku1.dts
@@ -0,0 +1,24 @@
+// 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-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
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v3 6/7] dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-jacuzzi-pico
2023-10-25 21:48 [PATCH v3 0/7] Add a few mt8183 follower boards Hsin-Yi Wang
` (4 preceding siblings ...)
2023-10-25 21:48 ` [PATCH v3 5/7] arm64: dts: mt8183: Add jacuzzi makomo board Hsin-Yi Wang
@ 2023-10-25 21:48 ` Hsin-Yi Wang
2023-10-25 21:48 ` [PATCH v3 7/7] arm64: dts: mt8183: Add jacuzzi pico/pico6 board Hsin-Yi Wang
2023-10-26 8:19 ` [PATCH v3 0/7] Add a few mt8183 follower boards AngeloGioacchino Del Regno
7 siblings, 0 replies; 13+ messages in thread
From: Hsin-Yi Wang @ 2023-10-25 21:48 UTC (permalink / raw)
To: Matthias Brugger, AngeloGioacchino Del Regno, Krzysztof Kozlowski
Cc: Rob Herring, Conor Dooley, Nícolas F . R . A . Prado,
Bernhard Rosenkränzer, Macpaul Lin, Sean Wang, devicetree,
linux-kernel, linux-arm-kernel, linux-mediatek
Add pico (sku1) and pico6 (sku2).
Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
---
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 54141b9bb714..bf793f644e6d 100644
--- a/Documentation/devicetree/bindings/arm/mediatek.yaml
+++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
@@ -258,6 +258,13 @@ properties:
- const: google,makomo-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
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v3 7/7] arm64: dts: mt8183: Add jacuzzi pico/pico6 board
2023-10-25 21:48 [PATCH v3 0/7] Add a few mt8183 follower boards Hsin-Yi Wang
` (5 preceding siblings ...)
2023-10-25 21:48 ` [PATCH v3 6/7] dt-bindings: arm64: dts: mediatek: Add mt8183-kukui-jacuzzi-pico Hsin-Yi Wang
@ 2023-10-25 21:48 ` Hsin-Yi Wang
2023-10-26 8:19 ` [PATCH v3 0/7] Add a few mt8183 follower boards AngeloGioacchino Del Regno
7 siblings, 0 replies; 13+ messages in thread
From: Hsin-Yi Wang @ 2023-10-25 21:48 UTC (permalink / raw)
To: Matthias Brugger, AngeloGioacchino Del Regno, Krzysztof Kozlowski
Cc: Rob Herring, Conor Dooley, Nícolas F . R . A . Prado,
Bernhard Rosenkränzer, Macpaul Lin, Sean Wang, devicetree,
linux-kernel, linux-arm-kernel, linux-mediatek
pico is also known as Acer Chromebook Spin 311.
Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
---
arch/arm64/boot/dts/mediatek/Makefile | 2 +
.../mediatek/mt8183-kukui-jacuzzi-pico.dts | 36 ++++++
.../mediatek/mt8183-kukui-jacuzzi-pico6.dts | 110 ++++++++++++++++++
3 files changed, 148 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/Makefile b/arch/arm64/boot/dts/mediatek/Makefile
index 1b85a8c12850..ed174dde97e1 100644
--- a/arch/arm64/boot/dts/mediatek/Makefile
+++ b/arch/arm64/boot/dts/mediatek/Makefile
@@ -34,6 +34,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-kappa.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-kenzo.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-makomo-sku0.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-makomo-sku1.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-pico.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-pico6.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-willow-sku0.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-willow-sku1.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kakadu.dtb
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..a2e74b829320
--- /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 GPIO_ACTIVE_LOW>;
+};
+
+&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 {
+ piins-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
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v3 0/7] Add a few mt8183 follower boards.
2023-10-25 21:48 [PATCH v3 0/7] Add a few mt8183 follower boards Hsin-Yi Wang
` (6 preceding siblings ...)
2023-10-25 21:48 ` [PATCH v3 7/7] arm64: dts: mt8183: Add jacuzzi pico/pico6 board Hsin-Yi Wang
@ 2023-10-26 8:19 ` AngeloGioacchino Del Regno
7 siblings, 0 replies; 13+ messages in thread
From: AngeloGioacchino Del Regno @ 2023-10-26 8:19 UTC (permalink / raw)
To: Hsin-Yi Wang, Matthias Brugger, Krzysztof Kozlowski
Cc: Rob Herring, Conor Dooley, Nícolas F . R . A . Prado,
Bernhard Rosenkränzer, Macpaul Lin, Sean Wang, devicetree,
linux-kernel, linux-arm-kernel, linux-mediatek
Il 25/10/23 23:48, Hsin-Yi Wang ha scritto:
> Add makomo, pico, and katsu which are mt8183 followers.
>
In this version, this series looks good to me;
I've sent some commits to the lists performing fixes and improvements to
the MediaTek devicetrees yesterday, including the interrupts-extended
changes to all of them.
Unfortunately, this series will not apply on top of those cleanups.
Can you please rebase this series on top of [1] and send a v4?
That'd make things a lot easier for me.
[1]:
https://lore.kernel.org/all/20231025093816.44327-1-angelogioacchino.delregno@collabora.com/
Thanks,
Angelo
> Hsin-Yi Wang (7):
> arm64: dts: mt8183: kukui: Fix underscores in node names
> 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 | 21 ++++
> arch/arm64/boot/dts/mediatek/Makefile | 6 +
> .../mt8183-kukui-jacuzzi-makomo-sku0.dts | 24 ++++
> .../mt8183-kukui-jacuzzi-makomo-sku1.dts | 24 ++++
> .../mediatek/mt8183-kukui-jacuzzi-pico.dts | 36 ++++++
> .../mediatek/mt8183-kukui-jacuzzi-pico6.dts | 110 ++++++++++++++++++
> .../dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 6 +-
> .../mediatek/mt8183-kukui-kakadu-sku22.dts | 18 +++
> .../boot/dts/mediatek/mt8183-kukui-kakadu.dts | 18 +++
> .../dts/mediatek/mt8183-kukui-kakadu.dtsi | 15 +--
> .../dts/mediatek/mt8183-kukui-katsu-sku32.dts | 36 ++++++
> .../dts/mediatek/mt8183-kukui-katsu-sku38.dts | 40 +++++++
> .../arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 94 +++++++--------
> 13 files changed, 384 insertions(+), 64 deletions(-)
> 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-sku32.dts
> create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts
>
^ permalink raw reply [flat|nested] 13+ messages in thread