Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48e21ded authored Jun 07, 2018 by Kevin Hilman

ARM64: dts: meson-gx: fix ATF reserved memory region



Vendor firmware/uboot has different reserved regions depending on
firmware version, but current codebase reserves the same regions on
GXL and GXBB, so move the additional reserved memory region to common
.dtsi.

Found when putting a recent vendor u-boot on meson-gxbb-p200.

Suggested-by: Neil Armstrong <narmstrong@baylibre.com>
Cc: stable@vger.kernel.org
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

parent d511b3e4

arch/arm64/boot/dts/amlogic/meson-gx.dtsi

+6 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,12 @@
		no-map;
		};

		/* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */
		secmon_reserved_alt: secmon@5000000 {
		reg = <0x0 0x05000000 0x0 0x300000>;
		no-map;
		};

		linux,cma {
		compatible = "shared-dma-pool";
		reusable;

arch/arm64/boot/dts/amlogic/meson-gxl.dtsi

+0 −8

Original line number	Diff line number	Diff line
		@@ -13,14 +13,6 @@
		/ {
		compatible = "amlogic,meson-gxl";

		reserved-memory {
		/* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */
		secmon_reserved_alt: secmon@5000000 {
		reg = <0x0 0x05000000 0x0 0x300000>;
		no-map;
		};
		};

		soc {
		usb0: usb@c9000000 {
		status = "disabled";