Fix Lepotata/meson64 NEXT pathces
This commit is contained in:
parent
4e1aa2af38
commit
e72005d76e
@ -28,10 +28,10 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/am
|
||||
index d8dd329..ebcb5eb 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
|
||||
@@ -49,6 +49,65 @@
|
||||
|
||||
/ {
|
||||
compatible = "amlogic,meson-gxl";
|
||||
@@ -57,6 +57,65 @@
|
||||
no-map;
|
||||
};
|
||||
};
|
||||
+
|
||||
+ soc {
|
||||
+
|
||||
@ -92,8 +92,5 @@ index d8dd329..ebcb5eb 100644
|
||||
+ status = "okay";
|
||||
+ };
|
||||
};
|
||||
|
||||
ðmac {
|
||||
--
|
||||
2.7.4
|
||||
|
||||
ðmac {
|
||||
@ -1,50 +0,0 @@
|
||||
From 157f93b346ac791d42e7dc2e17a6f5540c045719 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Wed, 11 Oct 2017 17:23:12 +0200
|
||||
Subject: [PATCH 30/36] ARM64: dts: meson-gxl: Add alternate ARM Trusted
|
||||
Firmware reserved memory zone
|
||||
|
||||
This year, Amlogic updated the ARM Trusted Firmware reserved memory mapping
|
||||
for Meson GXL SoCs and products sold since May 2017 uses this alternate
|
||||
reserved memory mapping.
|
||||
But products had been sold using the previous mapping.
|
||||
|
||||
This issue has been explained in [1] and a dynamic solution is yet to be
|
||||
found to avoid loosing another 3Mbytes of reservable memory.
|
||||
|
||||
In the meantime, this patch adds this alternate memory zone only for
|
||||
the GXL and GXM SoCs since GXBB based new products stopped earlier.
|
||||
|
||||
[1] http://lists.infradead.org/pipermail/linux-amlogic/2017-October/004860.html
|
||||
|
||||
Fixes: bba8e3f42736 ("ARM64: dts: meson-gx: Add firmware reserved memory zones")
|
||||
Reported-by: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Acked-by: Will Deacon <will.deacon@arm.com>
|
||||
Tested-by: Will Deacon <will.deacon@arm.com>
|
||||
---
|
||||
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
|
||||
index fc59a5a..4a1bd89 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
|
||||
@@ -50,6 +50,14 @@
|
||||
/ {
|
||||
compatible = "amlogic,meson-gxl";
|
||||
|
||||
+ reserved-memory {
|
||||
+ /* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */
|
||||
+ secmon_reserved_alt: secmon@05000000 {
|
||||
+ reg = <0x0 0x05000000 0x0 0x300000>;
|
||||
+ no-map;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
soc {
|
||||
|
||||
usb0: usb@c9000000 {
|
||||
--
|
||||
2.7.4
|
||||
|
||||
Loading…
Reference in New Issue
Block a user