98 lines
2.4 KiB
Diff
98 lines
2.4 KiB
Diff
|
From 7c1a570a1d2c3c2ec34d652002a1018464c2b5ca Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ondrej Jirman <megous@megous.com>
|
||
|
|
Date: Mon, 28 Sep 2020 04:45:30 +0200
|
||
|
|
Subject: [PATCH 306/323] Avoid merge conflicts with my other branches
|
||
|
|
|
||
|
|
---
|
||
|
|
arch/arm/boot/dts/sunxi-h3-h5.dtsi | 38 +++++++++----------
|
||
|
|
.../dts/allwinner/sun50i-h6-orangepi-3.dts | 12 +++---
|
||
|
|
2 files changed, 25 insertions(+), 25 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
|
||
|
|
index 50437ad5b..78b9c1c6f 100644
|
||
|
|
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
|
||
|
|
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
|
||
|
|
@@ -112,25 +112,6 @@ scpi_protocol: scpi {
|
||
|
|
shmem = <&scpi_sram>;
|
||
|
|
};
|
||
|
|
|
||
|
|
- hdmi_sound: hdmi-sound {
|
||
|
|
- compatible = "simple-audio-card";
|
||
|
|
- simple-audio-card,format = "i2s";
|
||
|
|
- simple-audio-card,name = "sun8i-h3-hdmi";
|
||
|
|
- simple-audio-card,mclk-fs = <128>;
|
||
|
|
- simple-audio-card,frame-inversion;
|
||
|
|
- status = "disabled";
|
||
|
|
-
|
||
|
|
- simple-audio-card,codec {
|
||
|
|
- sound-dai = <&hdmi>;
|
||
|
|
- };
|
||
|
|
-
|
||
|
|
- simple-audio-card,cpu {
|
||
|
|
- sound-dai = <&i2s2>;
|
||
|
|
- dai-tdm-slot-num = <2>;
|
||
|
|
- dai-tdm-slot-width = <32>;
|
||
|
|
- };
|
||
|
|
- };
|
||
|
|
-
|
||
|
|
soc {
|
||
|
|
compatible = "simple-bus";
|
||
|
|
#address-cells = <1>;
|
||
|
|
@@ -975,4 +956,23 @@ r_pwm: pwm@1f03800 {
|
||
|
|
status = "disabled";
|
||
|
|
};
|
||
|
|
};
|
||
|
|
+
|
||
|
|
+ hdmi_sound: hdmi-sound {
|
||
|
|
+ compatible = "simple-audio-card";
|
||
|
|
+ simple-audio-card,format = "i2s";
|
||
|
|
+ simple-audio-card,name = "sun8i-h3-hdmi";
|
||
|
|
+ simple-audio-card,mclk-fs = <128>;
|
||
|
|
+ simple-audio-card,frame-inversion;
|
||
|
|
+ status = "disabled";
|
||
|
|
+
|
||
|
|
+ simple-audio-card,codec {
|
||
|
|
+ sound-dai = <&hdmi>;
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
+ simple-audio-card,cpu {
|
||
|
|
+ sound-dai = <&i2s2>;
|
||
|
|
+ dai-tdm-slot-num = <2>;
|
||
|
|
+ dai-tdm-slot-width = <32>;
|
||
|
|
+ };
|
||
|
|
+ };
|
||
|
|
};
|
||
|
|
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 895265064..fd28e8891 100644
|
||
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
|
||
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
|
||
|
|
@@ -135,12 +135,6 @@ &hdmi {
|
||
|
|
status = "okay";
|
||
|
|
};
|
||
|
|
|
||
|
|
-&hdmi_out {
|
||
|
|
- hdmi_out_con: endpoint {
|
||
|
|
- remote-endpoint = <&hdmi_con_in>;
|
||
|
|
- };
|
||
|
|
-};
|
||
|
|
-
|
||
|
|
&emac {
|
||
|
|
pinctrl-names = "default";
|
||
|
|
pinctrl-0 = <&ext_rgmii_pins>;
|
||
|
|
@@ -178,6 +172,12 @@ &i2s1 {
|
||
|
|
status = "okay";
|
||
|
|
};
|
||
|
|
|
||
|
|
+&hdmi_out {
|
||
|
|
+ hdmi_out_con: endpoint {
|
||
|
|
+ remote-endpoint = <&hdmi_con_in>;
|
||
|
|
+ };
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
&mmc0 {
|
||
|
|
vmmc-supply = <®_cldo1>;
|
||
|
|
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
|
||
|
|
--
|
||
|
|
2.34.0
|
||
|
|
|