From e72005d76e0e10038e75f274d1f144893adcd536 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sat, 2 Dec 2017 17:29:19 +0100 Subject: [PATCH] Fix Lepotata/meson64 NEXT pathces --- ...4-dts-meson-gxl-add-USB-host-support.patch | 13 ++--- ...gxl-Add-alternate-ARM-Trusted-Firmwa.patch | 50 ------------------- 2 files changed, 5 insertions(+), 58 deletions(-) delete mode 100644 patch/kernel/meson64-next/0030-ARM64-dts-meson-gxl-Add-alternate-ARM-Trusted-Firmwa.patch diff --git a/patch/kernel/meson64-next/0007-ARM64-dts-meson-gxl-add-USB-host-support.patch b/patch/kernel/meson64-next/0007-ARM64-dts-meson-gxl-add-USB-host-support.patch index 7abd6dde3b..17409a844c 100644 --- a/patch/kernel/meson64-next/0007-ARM64-dts-meson-gxl-add-USB-host-support.patch +++ b/patch/kernel/meson64-next/0007-ARM64-dts-meson-gxl-add-USB-host-support.patch @@ -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 { \ No newline at end of file diff --git a/patch/kernel/meson64-next/0030-ARM64-dts-meson-gxl-Add-alternate-ARM-Trusted-Firmwa.patch b/patch/kernel/meson64-next/0030-ARM64-dts-meson-gxl-Add-alternate-ARM-Trusted-Firmwa.patch deleted file mode 100644 index 304d6f10a6..0000000000 --- a/patch/kernel/meson64-next/0030-ARM64-dts-meson-gxl-Add-alternate-ARM-Trusted-Firmwa.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 157f93b346ac791d42e7dc2e17a6f5540c045719 Mon Sep 17 00:00:00 2001 -From: Neil Armstrong -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 -Signed-off-by: Neil Armstrong -Acked-by: Will Deacon -Tested-by: Will Deacon ---- - 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 -