205 lines
5.3 KiB
Diff
205 lines
5.3 KiB
Diff
From 5e3be0be98c5650c4209756306e4df77d694cc05 Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
Date: Sun, 9 May 2021 10:42:16 +0200
|
|
Subject: [PATCH 254/464] arm64: dts: allwinner: a64: 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 A64 boards with HDMI connector.
|
|
|
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
---
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 8 ++++++++
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 8 ++++++++
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts | 7 +++++++
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 8 ++++++++
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 8 ++++++++
|
|
.../boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts | 8 ++++++++
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts | 8 ++++++++
|
|
7 files changed, 55 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
|
|
index e6d5bc0f7a61..a0c78d00e202 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
|
|
@@ -130,6 +130,10 @@ &i2c1_pins {
|
|
bias-pull-up;
|
|
};
|
|
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mdio {
|
|
ext_rgmii_phy: ethernet-phy@1 {
|
|
compatible = "ethernet-phy-ieee802.3-c22";
|
|
@@ -341,6 +345,10 @@ &sound {
|
|
"MIC1", "Onboard Microphone";
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_pb_pins>;
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
|
|
index 0af6dcdf7515..6239d2c435c8 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
|
|
@@ -102,6 +102,10 @@ &i2c1_pins {
|
|
bias-pull-up;
|
|
};
|
|
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mdio {
|
|
ext_rgmii_phy: ethernet-phy@1 {
|
|
compatible = "ethernet-phy-ieee802.3-c22";
|
|
@@ -252,6 +256,10 @@ &simplefb_hdmi {
|
|
vcc-hdmi-supply = <®_dldo1>;
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_pb_pins>;
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
|
|
index bfb806cf6d7a..21d0bdc28766 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
|
|
@@ -120,6 +120,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mdio {
|
|
ext_rgmii_phy: ethernet-phy@1 {
|
|
compatible = "ethernet-phy-ieee802.3-c22";
|
|
@@ -355,6 +359,9 @@ &sound {
|
|
"MIC1", "Microphone Jack Left",
|
|
"Microphone Jack Right", "MBIAS",
|
|
"MIC2", "Microphone Jack Right";
|
|
+};
|
|
+
|
|
+&sound_hdmi {
|
|
status = "okay";
|
|
};
|
|
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
|
|
index 4f8529d5ac00..306ce4acf967 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
|
|
@@ -137,6 +137,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mdio {
|
|
ext_rgmii_phy: ethernet-phy@1 {
|
|
compatible = "ethernet-phy-ieee802.3-c22";
|
|
@@ -340,6 +344,10 @@ &sound {
|
|
"MIC1", "Onboard Microphone";
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&spi0 {
|
|
status = "okay";
|
|
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
|
index 2accb5ddf783..17886709b6b4 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
|
@@ -107,6 +107,10 @@ &i2c1_pins {
|
|
bias-pull-up;
|
|
};
|
|
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mdio {
|
|
ext_rmii_phy1: ethernet-phy@1 {
|
|
compatible = "ethernet-phy-ieee802.3-c22";
|
|
@@ -270,6 +274,10 @@ &sound {
|
|
status = "okay";
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
/* On Euler connector */
|
|
&spdif {
|
|
status = "disabled";
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
|
|
index 5e66ce1a334f..970d528378db 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
|
|
@@ -96,6 +96,10 @@ hdmi_out_con: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mdio {
|
|
ext_rgmii_phy: ethernet-phy@1 {
|
|
compatible = "ethernet-phy-ieee802.3-c22";
|
|
@@ -169,6 +173,10 @@ &sound {
|
|
status = "okay";
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_pb_pins>;
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
|
|
index 1128030e4c25..061e4d9afcc9 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
|
|
@@ -150,6 +150,10 @@ anx6345_in: endpoint {
|
|
};
|
|
};
|
|
|
|
+&i2s2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&mixer0 {
|
|
status = "okay";
|
|
};
|
|
@@ -366,6 +370,10 @@ &sound {
|
|
status = "okay";
|
|
};
|
|
|
|
+&sound_hdmi {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&tcon0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&lcd_rgb666_pins>;
|
|
--
|
|
2.34.1
|
|
|