mirror of
https://github.com/armbian/build.git
synced 2025-09-19 04:31:38 +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
82 lines
2.4 KiB
Diff
82 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Holland <samuel@sholland.org>
|
|
Date: Wed, 1 Jan 2020 16:12:36 -0600
|
|
Subject: ARM: dts: sunxi: h3/h5: Add SCPI protocol
|
|
|
|
Signed-off-by: Samuel Holland <samuel@sholland.org>
|
|
---
|
|
arch/arm/boot/dts/allwinner/sun8i-h3.dtsi | 13 ++++++++++
|
|
arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi | 7 +++++
|
|
arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 13 ++++++++++
|
|
3 files changed, 33 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi b/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi
|
|
index 5b89d444f86e..4bfebc9752c8 100644
|
|
--- a/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi
|
|
+++ b/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi
|
|
@@ -176,6 +176,19 @@ syscon: system-control@1c00000 {
|
|
#size-cells = <1>;
|
|
ranges;
|
|
|
|
+ sram_a2: sram@40000 {
|
|
+ compatible = "mmio-sram";
|
|
+ reg = <0x00040000 0xc000>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+ ranges = <0 0x00040000 0xc000>;
|
|
+
|
|
+ scpi_sram: scp-shmem@bc00 {
|
|
+ compatible = "arm,scp-shmem";
|
|
+ reg = <0xbc00 0x200>;
|
|
+ };
|
|
+ };
|
|
+
|
|
sram_c: sram@1d00000 {
|
|
compatible = "mmio-sram";
|
|
reg = <0x01d00000 0x80000>;
|
|
diff --git a/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
|
|
index 9f350194f86c..ad2179fae156 100644
|
|
--- a/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
|
|
+++ b/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
|
|
@@ -120,6 +120,13 @@ cpu {
|
|
};
|
|
};
|
|
|
|
+ scpi_protocol: scpi {
|
|
+ compatible = "arm,scpi";
|
|
+ mboxes = <&msgbox 2>, <&msgbox 3>;
|
|
+ mbox-names = "tx", "rx";
|
|
+ shmem = <&scpi_sram>;
|
|
+ };
|
|
+
|
|
soc {
|
|
compatible = "simple-bus";
|
|
#address-cells = <1>;
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
|
|
index 7edd3be7e180..080c3d10fdfa 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
|
|
@@ -92,6 +92,19 @@ syscon: system-control@1c00000 {
|
|
#size-cells = <1>;
|
|
ranges;
|
|
|
|
+ sram_a2: sram@40000 {
|
|
+ compatible = "mmio-sram";
|
|
+ reg = <0x00040000 0x14000>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+ ranges = <0 0x00040000 0x14000>;
|
|
+
|
|
+ scpi_sram: scp-shmem@13c00 {
|
|
+ compatible = "arm,scp-shmem";
|
|
+ reg = <0x13c00 0x200>;
|
|
+ };
|
|
+ };
|
|
+
|
|
sram_c1: sram@18000 {
|
|
compatible = "mmio-sram";
|
|
reg = <0x00018000 0x1c000>;
|
|
--
|
|
Armbian
|
|
|