Skip to content

Commit

Permalink
ARM64: dts: meson-gx: fix ATF reserved memory region
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
khilman committed Jun 27, 2018
1 parent d511b3e commit 48e21de
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
6 changes: 6 additions & 0 deletions arch/arm64/boot/dts/amlogic/meson-gx.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 0 additions & 8 deletions arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down

0 comments on commit 48e21de

Please sign in to comment.