mirror of
https://github.com/armbian/build.git
synced 2025-09-19 12:41:39 +02:00
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
67 lines
1.8 KiB
Diff
67 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Holland <samuel@sholland.org>
|
|
Date: Sun, 6 Dec 2020 11:15:34 -0600
|
|
Subject: arm64: dts: allwinner: Enforce consistent MMC numbering
|
|
|
|
Signed-off-by: Samuel Holland <samuel@sholland.org>
|
|
---
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 6 ++++++
|
|
arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 6 ++++++
|
|
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 6 ++++++
|
|
3 files changed, 18 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
|
index 5610e1364ba1..1dad2180ce91 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
|
@@ -18,6 +18,12 @@ / {
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
|
|
+ aliases {
|
|
+ mmc0 = &mmc0;
|
|
+ mmc1 = &mmc1;
|
|
+ mmc2 = &mmc2;
|
|
+ };
|
|
+
|
|
chosen {
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
|
|
index d3caf27b6a55..0e3101af4b56 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
|
|
@@ -6,6 +6,12 @@
|
|
#include <dt-bindings/thermal/thermal.h>
|
|
|
|
/ {
|
|
+ aliases {
|
|
+ mmc0 = &mmc0;
|
|
+ mmc1 = &mmc1;
|
|
+ mmc2 = &mmc2;
|
|
+ };
|
|
+
|
|
cpus {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
|
|
index ff58dc32218f..efb141c4dff8 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
|
|
@@ -17,6 +17,12 @@ / {
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
|
|
+ aliases {
|
|
+ mmc0 = &mmc0;
|
|
+ mmc1 = &mmc1;
|
|
+ mmc2 = &mmc2;
|
|
+ };
|
|
+
|
|
cpus {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
--
|
|
Armbian
|
|
|