152 lines
3.9 KiB
Diff
152 lines
3.9 KiB
Diff
From 1fd9e0712cb6f3e99a71dd2f6cd7c5a00c324418 Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
Date: Tue, 10 Nov 2020 20:43:59 +0100
|
|
Subject: [PATCH 387/478] 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 ++++++++
|
|
arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 8 ++++++++
|
|
5 files changed, 40 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 6249e9e02928..17c99ab66d1c 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
|
|
@@ -118,6 +118,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s1 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mdio {
|
|
ext_rgmii_phy: ethernet-phy@1 {
|
|
compatible = "ethernet-phy-ieee802.3-c22";
|
|
@@ -289,6 +293,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 c45d7b7fb39a..6cac70c71ab5 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
|
|
@@ -128,6 +128,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s1 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mmc0 {
|
|
vmmc-supply = <®_cldo1>;
|
|
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
|
|
@@ -299,6 +303,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 92745128fcfe..b019bbaae21d 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 1ffd68f43f87..341f42ae0f30 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.
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts
|
|
index 8f2a80f128de..e91860a9e850 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts
|
|
@@ -89,6 +89,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s1 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mmc0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&mmc0_pins>;
|
|
@@ -127,6 +131,10 @@ &r_ir {
|
|
status = "okay";
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_ph_pins>;
|
|
--
|
|
2.35.3
|
|
|