116 lines
2.8 KiB
Diff
116 lines
2.8 KiB
Diff
|
From d35bfb4248421edc8d0e53bfb7549ee0c85be0f5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
|
||
|
|
Date: Sun, 9 May 2021 23:43:21 +0200
|
||
|
|
Subject: [PATCH 267/464] Move a node to avoid merge conflict
|
||
|
|
|
||
|
|
---
|
||
|
|
arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi | 12 ++++-----
|
||
|
|
.../dts/allwinner/sun50i-h6-orangepi-3.dts | 8 +++---
|
||
|
|
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 27 +++++++++----------
|
||
|
|
3 files changed, 23 insertions(+), 24 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
|
||
|
|
index 3c0da94661c9..699ab2f7a1ac 100644
|
||
|
|
--- a/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
|
||
|
|
+++ b/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
|
||
|
|
@@ -100,12 +100,6 @@ osc32k: osc32k_clk {
|
||
|
|
};
|
||
|
|
};
|
||
|
|
|
||
|
|
- de: display-engine {
|
||
|
|
- compatible = "allwinner,sun8i-h3-display-engine";
|
||
|
|
- allwinner,pipelines = <&mixer0>;
|
||
|
|
- status = "disabled";
|
||
|
|
- };
|
||
|
|
-
|
||
|
|
sound_hdmi: sound_hdmi {
|
||
|
|
compatible = "allwinner,sun9i-a80-hdmi-audio",
|
||
|
|
"allwinner,sun8i-h3-hdmi-audio";
|
||
|
|
@@ -120,6 +114,12 @@ cpu {
|
||
|
|
};
|
||
|
|
};
|
||
|
|
|
||
|
|
+ de: display-engine {
|
||
|
|
+ compatible = "allwinner,sun8i-h3-display-engine";
|
||
|
|
+ allwinner,pipelines = <&mixer0>;
|
||
|
|
+ status = "disabled";
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
soc {
|
||
|
|
compatible = "simple-bus";
|
||
|
|
#address-cells = <1>;
|
||
|
|
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 3d264de784de..fca1d8cd6d86 100644
|
||
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
|
||
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
|
||
|
|
@@ -118,6 +118,10 @@ &gpu {
|
||
|
|
status = "okay";
|
||
|
|
};
|
||
|
|
|
||
|
|
+&i2s1 {
|
||
|
|
+ status = "okay";
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
&hdmi {
|
||
|
|
status = "okay";
|
||
|
|
};
|
||
|
|
@@ -128,10 +132,6 @@ hdmi_out_con: endpoint {
|
||
|
|
};
|
||
|
|
};
|
||
|
|
|
||
|
|
-&i2s1 {
|
||
|
|
- status = "okay";
|
||
|
|
-};
|
||
|
|
-
|
||
|
|
&mmc0 {
|
||
|
|
vmmc-supply = <®_cldo1>;
|
||
|
|
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
|
||
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
|
||
|
|
index ff58dc32218f..fcbb1d79578e 100644
|
||
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
|
||
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
|
||
|
|
@@ -89,20 +89,6 @@ psci {
|
||
|
|
method = "smc";
|
||
|
|
};
|
||
|
|
|
||
|
|
- sound_hdmi: sound_hdmi {
|
||
|
|
- compatible = "allwinner,sun9i-a80-hdmi-audio",
|
||
|
|
- "allwinner,sun50i-h6-hdmi-audio";
|
||
|
|
- status = "disabled";
|
||
|
|
-
|
||
|
|
- codec {
|
||
|
|
- sound-dai = <&hdmi>;
|
||
|
|
- };
|
||
|
|
-
|
||
|
|
- cpu {
|
||
|
|
- sound-dai = <&i2s1>;
|
||
|
|
- };
|
||
|
|
- };
|
||
|
|
-
|
||
|
|
timer {
|
||
|
|
compatible = "arm,armv8-timer";
|
||
|
|
arm,no-tick-in-suspend;
|
||
|
|
@@ -116,6 +102,19 @@ timer {
|
||
|
|
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
|
||
|
|
};
|
||
|
|
|
||
|
|
+ sound_hdmi: sound_hdmi {
|
||
|
|
+ compatible = "allwinner,sun9i-a80-hdmi-audio",
|
||
|
|
+ "allwinner,sun50i-h6-hdmi-audio";
|
||
|
|
+ status = "disabled";
|
||
|
|
+
|
||
|
|
+ codec {
|
||
|
|
+ sound-dai = <&hdmi>;
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
+ cpu {
|
||
|
|
+ sound-dai = <&i2s1>;
|
||
|
|
+ };
|
||
|
|
+ };
|
||
|
|
|
||
|
|
soc {
|
||
|
|
compatible = "simple-bus";
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|