mirror of
https://github.com/armbian/build.git
synced 2025-08-14 23:26:57 +02:00
d1186b8a0e
I have changed the way the patches are generated a bit. Instead of using orange-pi branch from megous tree for 6.6 kernel, I have used the following kernel branches a83t-suspend, af8133j, anx, audio, axp, cam, drm, err, fixes, mbus, modem, opi3, pb, pinetab, pp, ppkb, samuel, speed, tbs-a711, ths These branches were carefully chosen to include only allwinner related patches and remove importing of the rockchip related patches into the allwinner kernel. Following patches are modified to fix patch application failure - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch - patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch - patches.armbian/arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch - patches.armbian/arm64-dts-allwinner-overlay-Add-Overlays-for-sunxi64.patch - patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch Following patches are modified because of kernel api change to fix compilation failure - patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch - patches.armbian/drv-of-Device-Tree-Overlay-ConfigFS-interface.patch
116 lines
2.8 KiB
Diff
116 lines
2.8 KiB
Diff
From 95ae6eabc966110f4d1799d07d420bca3ab93662 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 26/27] 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
|
|
|