* [PATCH v2 0/5] arm64: dts: mediatek: Add newer revisions of Google Spherion and Hayato
@ 2023-03-13 20:14 Nícolas F. R. A. Prado
2023-03-13 20:14 ` [PATCH v2 1/5] dt-bindings: arm64: dts: mediatek: Add rev5-sku2 of hayato Nícolas F. R. A. Prado
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Nícolas F. R. A. Prado @ 2023-03-13 20:14 UTC (permalink / raw)
To: Matthias Brugger
Cc: AngeloGioacchino Del Regno, kernel, Chen-Yu Tsai,
Nícolas F. R. A. Prado, Allen-KH Cheng, Andrew Lunn,
Bernhard Rosenkränzer, Frank Wunderlich, Krzysztof Kozlowski,
Rob Herring, Sean Wang, devicetree, linux-arm-kernel,
linux-kernel, linux-mediatek
Add devicetrees for the newer revisions of two machines: Google Spherion
rev4 and Google Hayato rev5-sku2. For both, the difference from the
previous revision is that they now use the rt5682s audio codec instead
of rt5682.
Changes in v2:
- Removed patch adding asurada-audio files for rt5682s
- Added patch moving nodes from existing asurada-audio files to board
dtsi
Nícolas F. R. A. Prado (5):
dt-bindings: arm64: dts: mediatek: Add rev5-sku2 of hayato
dt-bindings: arm64: dts: mediatek: Add rev4 of spherion
arm64: dts: mediatek: Remove asurada-audio dtsi files
arm64: dts: mediatek: Add hayato-rev5-sku2
arm64: dts: mediatek: Add spherion-rev4
.../devicetree/bindings/arm/mediatek.yaml | 11 +++
arch/arm64/boot/dts/mediatek/Makefile | 2 +
.../mt8192-asurada-audio-rt1015p-rt5682.dtsi | 19 -----
.../mt8192-asurada-audio-rt1015p.dtsi | 26 -------
.../mediatek/mt8192-asurada-audio-rt5682.dtsi | 21 -----
.../dts/mediatek/mt8192-asurada-hayato-r1.dts | 19 ++++-
.../mt8192-asurada-hayato-r5-sku2.dts | 64 +++++++++++++++
.../mediatek/mt8192-asurada-spherion-r0.dts | 19 ++++-
.../mediatek/mt8192-asurada-spherion-r4.dts | 77 +++++++++++++++++++
.../boot/dts/mediatek/mt8192-asurada.dtsi | 28 +++++++
10 files changed, 218 insertions(+), 68 deletions(-)
delete mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p-rt5682.dtsi
delete mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p.dtsi
delete mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt5682.dtsi
create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r5-sku2.dts
create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r4.dts
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/5] dt-bindings: arm64: dts: mediatek: Add rev5-sku2 of hayato
2023-03-13 20:14 [PATCH v2 0/5] arm64: dts: mediatek: Add newer revisions of Google Spherion and Hayato Nícolas F. R. A. Prado
@ 2023-03-13 20:14 ` Nícolas F. R. A. Prado
2023-03-13 20:14 ` [PATCH v2 2/5] dt-bindings: arm64: dts: mediatek: Add rev4 of spherion Nícolas F. R. A. Prado
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Nícolas F. R. A. Prado @ 2023-03-13 20:14 UTC (permalink / raw)
To: Matthias Brugger
Cc: AngeloGioacchino Del Regno, kernel, Chen-Yu Tsai,
Nícolas F. R. A. Prado, Allen-KH Cheng, Andrew Lunn,
Bernhard Rosenkränzer, Frank Wunderlich, Krzysztof Kozlowski,
Rob Herring, Sean Wang, devicetree, linux-arm-kernel,
linux-kernel, linux-mediatek
Add binding for newer version of Google Hayato: rev5-sku2.
Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
(no changes since v1)
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 ae12b1cab9fb..11458cd16109 100644
--- a/Documentation/devicetree/bindings/arm/mediatek.yaml
+++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
@@ -133,6 +133,12 @@ properties:
- enum:
- mediatek,mt8183-evb
- const: mediatek,mt8183
+ - description: Google Hayato rev5
+ items:
+ - const: google,hayato-rev5-sku2
+ - const: google,hayato-sku2
+ - const: google,hayato
+ - const: mediatek,mt8192
- description: Google Hayato
items:
- const: google,hayato-rev1
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/5] dt-bindings: arm64: dts: mediatek: Add rev4 of spherion
2023-03-13 20:14 [PATCH v2 0/5] arm64: dts: mediatek: Add newer revisions of Google Spherion and Hayato Nícolas F. R. A. Prado
2023-03-13 20:14 ` [PATCH v2 1/5] dt-bindings: arm64: dts: mediatek: Add rev5-sku2 of hayato Nícolas F. R. A. Prado
@ 2023-03-13 20:14 ` Nícolas F. R. A. Prado
2023-03-13 20:14 ` [PATCH v2 3/5] arm64: dts: mediatek: Remove asurada-audio dtsi files Nícolas F. R. A. Prado
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Nícolas F. R. A. Prado @ 2023-03-13 20:14 UTC (permalink / raw)
To: Matthias Brugger
Cc: AngeloGioacchino Del Regno, kernel, Chen-Yu Tsai,
Nícolas F. R. A. Prado, Allen-KH Cheng, Andrew Lunn,
Bernhard Rosenkränzer, Krzysztof Kozlowski, Rob Herring,
Sean Wang, devicetree, linux-arm-kernel, linux-kernel,
linux-mediatek
Add binding for newer version of Google Spherion (Acer Chromebook 514):
rev4.
Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
(no changes since v1)
Documentation/devicetree/bindings/arm/mediatek.yaml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/mediatek.yaml b/Documentation/devicetree/bindings/arm/mediatek.yaml
index 11458cd16109..fd6587253191 100644
--- a/Documentation/devicetree/bindings/arm/mediatek.yaml
+++ b/Documentation/devicetree/bindings/arm/mediatek.yaml
@@ -144,6 +144,11 @@ properties:
- const: google,hayato-rev1
- const: google,hayato
- const: mediatek,mt8192
+ - description: Google Spherion rev4 (Acer Chromebook 514)
+ items:
+ - const: google,spherion-rev4
+ - const: google,spherion
+ - const: mediatek,mt8192
- description: Google Spherion (Acer Chromebook 514)
items:
- const: google,spherion-rev3
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/5] arm64: dts: mediatek: Remove asurada-audio dtsi files
2023-03-13 20:14 [PATCH v2 0/5] arm64: dts: mediatek: Add newer revisions of Google Spherion and Hayato Nícolas F. R. A. Prado
2023-03-13 20:14 ` [PATCH v2 1/5] dt-bindings: arm64: dts: mediatek: Add rev5-sku2 of hayato Nícolas F. R. A. Prado
2023-03-13 20:14 ` [PATCH v2 2/5] dt-bindings: arm64: dts: mediatek: Add rev4 of spherion Nícolas F. R. A. Prado
@ 2023-03-13 20:14 ` Nícolas F. R. A. Prado
2023-03-13 20:14 ` [PATCH v2 4/5] arm64: dts: mediatek: Add hayato-rev5-sku2 Nícolas F. R. A. Prado
2023-03-13 20:14 ` [PATCH v2 5/5] arm64: dts: mediatek: Add spherion-rev4 Nícolas F. R. A. Prado
4 siblings, 0 replies; 6+ messages in thread
From: Nícolas F. R. A. Prado @ 2023-03-13 20:14 UTC (permalink / raw)
To: Matthias Brugger
Cc: AngeloGioacchino Del Regno, kernel, Chen-Yu Tsai,
Nícolas F. R. A. Prado, Krzysztof Kozlowski, Rob Herring,
devicetree, linux-arm-kernel, linux-kernel, linux-mediatek
There aren't enough users of the common asurada-audio dtsi files to
justify having them. It is simpler to just have the audio nodes directly
on the board files.
Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
---
(no changes since v1)
.../mt8192-asurada-audio-rt1015p-rt5682.dtsi | 19 -------------
.../mt8192-asurada-audio-rt1015p.dtsi | 26 -----------------
.../mediatek/mt8192-asurada-audio-rt5682.dtsi | 21 --------------
.../dts/mediatek/mt8192-asurada-hayato-r1.dts | 19 ++++++++++++-
.../mediatek/mt8192-asurada-spherion-r0.dts | 19 ++++++++++++-
.../boot/dts/mediatek/mt8192-asurada.dtsi | 28 +++++++++++++++++++
6 files changed, 64 insertions(+), 68 deletions(-)
delete mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p-rt5682.dtsi
delete mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p.dtsi
delete mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt5682.dtsi
diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p-rt5682.dtsi b/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p-rt5682.dtsi
deleted file mode 100644
index f521f50d448f..000000000000
--- a/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p-rt5682.dtsi
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright 2020 Google LLC
- */
-
-#include "mt8192-asurada-audio-rt5682.dtsi"
-#include "mt8192-asurada-audio-rt1015p.dtsi"
-
-&sound {
- compatible = "mediatek,mt8192_mt6359_rt1015p_rt5682";
-
- speaker-codecs {
- sound-dai = <&rt1015p>;
- };
-
- headset-codec {
- sound-dai = <&rt5682 0>;
- };
-};
diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p.dtsi b/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p.dtsi
deleted file mode 100644
index e5743789934e..000000000000
--- a/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p.dtsi
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright (C) 2022 MediaTek Inc.
- */
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/pinctrl/mt8192-pinfunc.h>
-
-/ {
- rt1015p: audio-codec {
- compatible = "realtek,rt1015p";
- pinctrl-names = "default";
- pinctrl-0 = <&rt1015p_pins>;
- sdb-gpios = <&pio 147 GPIO_ACTIVE_HIGH>;
- #sound-dai-cells = <0>;
- };
-};
-
-&pio {
- rt1015p_pins: rt1015p-default-pins {
- pins {
- pinmux = <PINMUX_GPIO147__FUNC_GPIO147>;
- output-low;
- };
- };
-};
diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt5682.dtsi b/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt5682.dtsi
deleted file mode 100644
index 05e48b870a92..000000000000
--- a/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt5682.dtsi
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright (C) 2022 MediaTek Inc.
- */
-
-&i2c1 {
- rt5682: audio-codec@1a {
- compatible = "realtek,rt5682i";
- reg = <0x1a>;
- interrupts-extended = <&pio 18 IRQ_TYPE_LEVEL_LOW>;
- realtek,jd-src = <1>;
- realtek,btndet-delay = <16>;
- #sound-dai-cells = <1>;
-
- AVDD-supply = <&mt6359_vio18_ldo_reg>;
- DBVDD-supply = <&mt6359_vio18_ldo_reg>;
- LDO1-IN-supply = <&mt6359_vio18_ldo_reg>;
- MICVDD-supply = <&pp3300_g>;
- VBAT-supply = <&pp3300_ldo_z>;
- };
-};
diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r1.dts b/arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r1.dts
index 43a823990a92..bad063a7d76b 100644
--- a/arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r1.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r1.dts
@@ -4,7 +4,6 @@
*/
/dts-v1/;
#include "mt8192-asurada.dtsi"
-#include "mt8192-asurada-audio-rt1015p-rt5682.dtsi"
/ {
model = "Google Hayato rev1";
@@ -40,6 +39,24 @@ CROS_STD_MAIN_KEYMAP
>;
};
+&rt5682 {
+ compatible = "realtek,rt5682i";
+ realtek,btndet-delay = <16>;
+ VBAT-supply = <&pp3300_ldo_z>;
+};
+
+&sound {
+ compatible = "mediatek,mt8192_mt6359_rt1015p_rt5682";
+
+ speaker-codecs {
+ sound-dai = <&rt1015p>;
+ };
+
+ headset-codec {
+ sound-dai = <&rt5682 0>;
+ };
+};
+
&touchscreen {
compatible = "hid-over-i2c";
post-power-on-delay-ms = <10>;
diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dts b/arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dts
index c6ad10cec95e..bc88866ab2f5 100644
--- a/arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dts
@@ -4,7 +4,6 @@
*/
/dts-v1/;
#include "mt8192-asurada.dtsi"
-#include "mt8192-asurada-audio-rt1015p-rt5682.dtsi"
#include <dt-bindings/leds/common.h>
/ {
@@ -58,6 +57,24 @@ CROS_STD_MAIN_KEYMAP
>;
};
+&rt5682 {
+ compatible = "realtek,rt5682i";
+ realtek,btndet-delay = <16>;
+ VBAT-supply = <&pp3300_ldo_z>;
+};
+
+&sound {
+ compatible = "mediatek,mt8192_mt6359_rt1015p_rt5682";
+
+ speaker-codecs {
+ sound-dai = <&rt1015p>;
+ };
+
+ headset-codec {
+ sound-dai = <&rt5682 0>;
+ };
+};
+
&touchscreen {
compatible = "elan,ekth3500";
};
diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi b/arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi
index 1b1669309291..b526b3b7a627 100644
--- a/arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi
@@ -210,6 +210,14 @@ wifi_restricted_dma_region: wifi@c0000000 {
};
};
+ rt1015p: audio-codec {
+ compatible = "realtek,rt1015p";
+ pinctrl-names = "default";
+ pinctrl-0 = <&rt1015p_pins>;
+ sdb-gpios = <&pio 147 GPIO_ACTIVE_HIGH>;
+ #sound-dai-cells = <0>;
+ };
+
sound: sound {
mediatek,platform = <&afe>;
mediatek,hdmi-codec = <&anx_bridge_dp>;
@@ -316,6 +324,19 @@ &i2c1 {
clock-frequency = <400000>;
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
+
+ rt5682: audio-codec@1a {
+ /* Realtek RT5682i or RT5682s, sharing the same configuration */
+ reg = <0x1a>;
+ interrupts-extended = <&pio 18 IRQ_TYPE_LEVEL_LOW>;
+ realtek,jd-src = <1>;
+ #sound-dai-cells = <1>;
+
+ AVDD-supply = <&mt6359_vio18_ldo_reg>;
+ DBVDD-supply = <&mt6359_vio18_ldo_reg>;
+ LDO1-IN-supply = <&mt6359_vio18_ldo_reg>;
+ MICVDD-supply = <&pp3300_g>;
+ };
};
&i2c2 {
@@ -1313,6 +1334,13 @@ pins-inhibit {
};
};
+ rt1015p_pins: rt1015p-default-pins {
+ pins {
+ pinmux = <PINMUX_GPIO147__FUNC_GPIO147>;
+ output-low;
+ };
+ };
+
scp_pins: scp-pins {
pins-vreq-vao {
pinmux = <PINMUX_GPIO195__FUNC_SCP_VREQ_VAO>;
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 4/5] arm64: dts: mediatek: Add hayato-rev5-sku2
2023-03-13 20:14 [PATCH v2 0/5] arm64: dts: mediatek: Add newer revisions of Google Spherion and Hayato Nícolas F. R. A. Prado
` (2 preceding siblings ...)
2023-03-13 20:14 ` [PATCH v2 3/5] arm64: dts: mediatek: Remove asurada-audio dtsi files Nícolas F. R. A. Prado
@ 2023-03-13 20:14 ` Nícolas F. R. A. Prado
2023-03-13 20:14 ` [PATCH v2 5/5] arm64: dts: mediatek: Add spherion-rev4 Nícolas F. R. A. Prado
4 siblings, 0 replies; 6+ messages in thread
From: Nícolas F. R. A. Prado @ 2023-03-13 20:14 UTC (permalink / raw)
To: Matthias Brugger
Cc: AngeloGioacchino Del Regno, kernel, Chen-Yu Tsai,
Nícolas F. R. A. Prado, Krzysztof Kozlowski, Rob Herring,
devicetree, linux-arm-kernel, linux-kernel, linux-mediatek
Add a devicetree for rev5-sku2 of Hayato. It uses the rt5682s audio
codec instead of the rt5682 used in the previous revision.
Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
---
Changes in v2:
- Added audio nodes directly in this file
arch/arm64/boot/dts/mediatek/Makefile | 1 +
.../mt8192-asurada-hayato-r5-sku2.dts | 64 +++++++++++++++++++
2 files changed, 65 insertions(+)
create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r5-sku2.dts
diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile
index d5cd7b3e09cf..6a16685cb958 100644
--- a/arch/arm64/boot/dts/mediatek/Makefile
+++ b/arch/arm64/boot/dts/mediatek/Makefile
@@ -45,6 +45,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-krane-sku176.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-pumpkin.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-evb.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-hayato-r1.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-hayato-r5-sku2.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-spherion-r0.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-evb.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-cherry-tomato-r1.dtb
diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r5-sku2.dts b/arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r5-sku2.dts
new file mode 100644
index 000000000000..3127ee5f6172
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r5-sku2.dts
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2022 Google LLC
+ */
+/dts-v1/;
+#include "mt8192-asurada.dtsi"
+
+/ {
+ model = "Google Hayato rev5";
+ compatible = "google,hayato-rev5-sku2", "google,hayato-sku2",
+ "google,hayato", "mediatek,mt8192";
+};
+
+&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 */
+ >;
+ linux,keymap = <
+ MATRIX_KEY(0x00, 0x02, KEY_BACK)
+ MATRIX_KEY(0x03, 0x02, KEY_FORWARD)
+ MATRIX_KEY(0x02, 0x02, KEY_REFRESH)
+ MATRIX_KEY(0x01, 0x02, KEY_FULL_SCREEN)
+ MATRIX_KEY(0x03, 0x04, KEY_SCALE)
+ 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)
+
+ CROS_STD_MAIN_KEYMAP
+ >;
+};
+
+&rt5682 {
+ compatible = "realtek,rt5682s";
+};
+
+&sound {
+ compatible = "mediatek,mt8192_mt6359_rt1015p_rt5682s";
+
+ speaker-codecs {
+ sound-dai = <&rt1015p>;
+ };
+
+ headset-codec {
+ sound-dai = <&rt5682 0>;
+ };
+};
+
+&touchscreen {
+ compatible = "hid-over-i2c";
+ post-power-on-delay-ms = <10>;
+ hid-descr-addr = <0x0001>;
+ vdd-supply = <&pp3300_u>;
+};
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 5/5] arm64: dts: mediatek: Add spherion-rev4
2023-03-13 20:14 [PATCH v2 0/5] arm64: dts: mediatek: Add newer revisions of Google Spherion and Hayato Nícolas F. R. A. Prado
` (3 preceding siblings ...)
2023-03-13 20:14 ` [PATCH v2 4/5] arm64: dts: mediatek: Add hayato-rev5-sku2 Nícolas F. R. A. Prado
@ 2023-03-13 20:14 ` Nícolas F. R. A. Prado
4 siblings, 0 replies; 6+ messages in thread
From: Nícolas F. R. A. Prado @ 2023-03-13 20:14 UTC (permalink / raw)
To: Matthias Brugger
Cc: AngeloGioacchino Del Regno, kernel, Chen-Yu Tsai,
Nícolas F. R. A. Prado, Krzysztof Kozlowski, Rob Herring,
devicetree, linux-arm-kernel, linux-kernel, linux-mediatek
Add a devicetree for rev4 of Spherion. It uses the rt5682s audio codec
instead of the rt5682 used in the previous revision.
Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
---
Changes in v2:
- Added audio nodes directly in this file
arch/arm64/boot/dts/mediatek/Makefile | 1 +
.../mediatek/mt8192-asurada-spherion-r4.dts | 77 +++++++++++++++++++
2 files changed, 78 insertions(+)
create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r4.dts
diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile
index 6a16685cb958..d08bfd8985a6 100644
--- a/arch/arm64/boot/dts/mediatek/Makefile
+++ b/arch/arm64/boot/dts/mediatek/Makefile
@@ -47,6 +47,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-evb.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-hayato-r1.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-hayato-r5-sku2.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-spherion-r0.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-spherion-r4.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-evb.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-cherry-tomato-r1.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-cherry-tomato-r2.dtb
diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r4.dts b/arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r4.dts
new file mode 100644
index 000000000000..0039158c9e60
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r4.dts
@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2022 Google LLC
+ */
+/dts-v1/;
+#include "mt8192-asurada.dtsi"
+#include <dt-bindings/leds/common.h>
+
+/ {
+ model = "Google Spherion (rev4)";
+ compatible = "google,spherion-rev4", "google,spherion",
+ "mediatek,mt8192";
+
+ pwmleds {
+ compatible = "pwm-leds";
+
+ led {
+ function = LED_FUNCTION_KBD_BACKLIGHT;
+ color = <LED_COLOR_ID_WHITE>;
+ pwms = <&cros_ec_pwm 0>;
+ max-brightness = <1023>;
+ };
+ };
+};
+
+&cros_ec_pwm {
+ status = "okay";
+};
+
+&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 */
+ >;
+ linux,keymap = <
+ MATRIX_KEY(0x00, 0x02, KEY_BACK)
+ MATRIX_KEY(0x03, 0x02, KEY_REFRESH)
+ MATRIX_KEY(0x02, 0x02, KEY_FULL_SCREEN)
+ 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)
+
+ CROS_STD_MAIN_KEYMAP
+ >;
+};
+
+&rt5682 {
+ compatible = "realtek,rt5682s";
+};
+
+&sound {
+ compatible = "mediatek,mt8192_mt6359_rt1015p_rt5682s";
+
+ speaker-codecs {
+ sound-dai = <&rt1015p>;
+ };
+
+ headset-codec {
+ sound-dai = <&rt5682 0>;
+ };
+};
+
+&touchscreen {
+ compatible = "elan,ekth3500";
+};
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-03-13 20:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-13 20:14 [PATCH v2 0/5] arm64: dts: mediatek: Add newer revisions of Google Spherion and Hayato Nícolas F. R. A. Prado
2023-03-13 20:14 ` [PATCH v2 1/5] dt-bindings: arm64: dts: mediatek: Add rev5-sku2 of hayato Nícolas F. R. A. Prado
2023-03-13 20:14 ` [PATCH v2 2/5] dt-bindings: arm64: dts: mediatek: Add rev4 of spherion Nícolas F. R. A. Prado
2023-03-13 20:14 ` [PATCH v2 3/5] arm64: dts: mediatek: Remove asurada-audio dtsi files Nícolas F. R. A. Prado
2023-03-13 20:14 ` [PATCH v2 4/5] arm64: dts: mediatek: Add hayato-rev5-sku2 Nícolas F. R. A. Prado
2023-03-13 20:14 ` [PATCH v2 5/5] arm64: dts: mediatek: Add spherion-rev4 Nícolas F. R. A. Prado
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).