125 lines
3.2 KiB
Diff
125 lines
3.2 KiB
Diff
From cc18d0872f7268188c8f1c3288f3774f8e33a11e Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
|
|
Date: Tue, 11 Jan 2022 13:08:47 +0100
|
|
Subject: [PATCH 247/391] arm64: dts: allwinner: h6: 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 H6 boards with HDMI connector.
|
|
|
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
---
|
|
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 8 ++++++++
|
|
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 8 ++++++++
|
|
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 8 ++++++++
|
|
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 8 ++++++++
|
|
4 files changed, 32 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
|
|
index 9ec49ac2f..c8cdab585 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
|
|
@@ -119,6 +119,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s1 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mdio {
|
|
ext_rgmii_phy: ethernet-phy@1 {
|
|
compatible = "ethernet-phy-ieee802.3-c22";
|
|
@@ -290,6 +294,10 @@ sw {
|
|
};
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&spdif {
|
|
status = "okay";
|
|
};
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
|
|
index c2ea73d43..ead12d861 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
|
|
@@ -167,6 +167,10 @@ ext_rgmii_phy: ethernet-phy@1 {
|
|
};
|
|
};
|
|
|
|
+&i2s1 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mmc0 {
|
|
vmmc-supply = <®_cldo1>;
|
|
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
|
|
@@ -339,6 +343,10 @@ &rtc {
|
|
clocks = <&ext_osc32k>;
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_ph_pins>;
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
|
|
index 92745128f..b019bbaae 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
|
|
@@ -91,6 +91,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s1 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mmc0 {
|
|
vmmc-supply = <®_cldo1>;
|
|
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
|
|
@@ -244,6 +248,10 @@ &rtc {
|
|
clocks = <&ext_osc32k>;
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_ph_pins>;
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
|
|
index 1ffd68f43..341f42ae0 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
|
|
@@ -123,6 +123,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s1 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mdio {
|
|
ext_rgmii_phy: ethernet-phy@1 {
|
|
compatible = "ethernet-phy-ieee802.3-c22";
|
|
@@ -298,6 +302,10 @@ &rtc {
|
|
clocks = <&ext_osc32k>;
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
/*
|
|
* The CS pin is shared with the MMC2 CMD pin, so we cannot have the SPI
|
|
* flash and eMMC at the same time, as one of them would fail probing.
|
|
--
|
|
2.35.3
|
|
|