274 lines
6.5 KiB
Diff
274 lines
6.5 KiB
Diff
From e30e2b9c27a48160690b7410c72fdacf8bcab78a Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
Date: Sun, 9 May 2021 11:06:37 +0200
|
|
Subject: [PATCH 239/391] ARM: dts: sun8i: h3: Enable hdmi sound card on boards
|
|
with hdmi
|
|
|
|
Each board that has HDMI connector can also transmit audio through it.
|
|
Enable HDMI sound card on all H3 boards with HDMI connector.
|
|
|
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
---
|
|
arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 8 ++++++++
|
|
arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3-devboard.dts | 8 ++++++++
|
|
arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 8 ++++++++
|
|
arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts | 8 ++++++++
|
|
arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 8 ++++++++
|
|
arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 8 ++++++++
|
|
arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 8 ++++++++
|
|
arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 8 ++++++++
|
|
arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts | 8 ++++++++
|
|
arch/arm/boot/dts/sun8i-h3-rervision-dvk.dts | 8 ++++++++
|
|
10 files changed, 80 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
|
|
index 27a0d5128..2bd797890 100644
|
|
--- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
|
|
+++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
|
|
@@ -159,6 +159,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&ir {
|
|
linux,rc-map-name = "rc-tanix-tx3mini";
|
|
pinctrl-names = "default";
|
|
@@ -213,6 +217,10 @@ ®_usb0_vbus {
|
|
status = "okay";
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&spdif {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&spdif_tx_pin>;
|
|
diff --git a/arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3-devboard.dts b/arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3-devboard.dts
|
|
index 02fbe00cd..61d6529dc 100644
|
|
--- a/arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3-devboard.dts
|
|
+++ b/arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3-devboard.dts
|
|
@@ -70,3 +70,11 @@ hdmi_out_con: endpoint {
|
|
&i2c1 {
|
|
status = "okay";
|
|
};
|
|
+
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
|
|
index 4ba533b03..e94ffe3c1 100644
|
|
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
|
|
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
|
|
@@ -118,6 +118,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&ir {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&r_ir_rx_pin>;
|
|
@@ -159,6 +163,10 @@ &ohci2 {
|
|
status = "okay";
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart3 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart3_pins>, <&uart3_rts_cts_pins>;
|
|
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts
|
|
index 69243dcb3..9393779f3 100644
|
|
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts
|
|
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts
|
|
@@ -91,6 +91,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&ir {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&r_ir_rx_pin>;
|
|
@@ -104,3 +108,7 @@ &ohci1 {
|
|
&ohci2 {
|
|
status = "okay";
|
|
};
|
|
+
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
|
|
index f1f9dbead..2b5890327 100644
|
|
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
|
|
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
|
|
@@ -145,6 +145,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&ir {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&r_ir_rx_pin>;
|
|
@@ -179,6 +183,10 @@ ®_usb1_vbus {
|
|
status = "okay";
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_pa_pins>;
|
|
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
|
|
index 305b34a32..9037bc673 100644
|
|
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
|
|
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
|
|
@@ -120,6 +120,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&ir {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&r_ir_rx_pin>;
|
|
@@ -156,6 +160,10 @@ &ohci2 {
|
|
status = "okay";
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_pa_pins>;
|
|
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
|
|
index 59f6f6d5e..927fd1bab 100644
|
|
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
|
|
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
|
|
@@ -146,6 +146,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mmc0 {
|
|
vmmc-supply = <®_vcc3v3>;
|
|
bus-width = <4>;
|
|
@@ -166,6 +170,10 @@ ®_usb0_vbus {
|
|
status = "okay";
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_pa_pins>;
|
|
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
|
|
index 92a58e362..624e248e3 100644
|
|
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
|
|
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
|
|
@@ -147,6 +147,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&ir {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&r_ir_rx_pin>;
|
|
@@ -206,6 +210,10 @@ ®_usb0_vbus {
|
|
status = "okay";
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_pa_pins>;
|
|
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts
|
|
index 561ea1d2f..70202baa5 100644
|
|
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts
|
|
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts
|
|
@@ -117,6 +117,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mmc0 {
|
|
vmmc-supply = <®_vcc3v3>;
|
|
bus-width = <4>;
|
|
@@ -155,6 +159,10 @@ &ohci0 {
|
|
status = "okay";
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_pa_pins>;
|
|
diff --git a/arch/arm/boot/dts/sun8i-h3-rervision-dvk.dts b/arch/arm/boot/dts/sun8i-h3-rervision-dvk.dts
|
|
index 4738f3a9e..ee645912e 100644
|
|
--- a/arch/arm/boot/dts/sun8i-h3-rervision-dvk.dts
|
|
+++ b/arch/arm/boot/dts/sun8i-h3-rervision-dvk.dts
|
|
@@ -69,6 +69,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mmc0 {
|
|
bus-width = <4>;
|
|
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
|
|
@@ -98,6 +102,10 @@ &ohci3 {
|
|
status = "okay";
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_pa_pins>;
|
|
--
|
|
2.35.3
|
|
|