diff options
| author | Kevin Hilman <khilman@baylibre.com> | 2018-06-07 13:51:01 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2018-06-27 16:48:25 -0700 |
| commit | 48e21ded0432ee1e2359d4143d7a6925cefee1b5 (patch) | |
| tree | 80368ea1b943dd6b891277b4bcdd0f6e16ad3aa0 /arch | |
| parent | d511b3e4087eedbe11c7496c396432b8b7c2d7d9 (diff) | |
| download | linux-4.18.y-48e21ded0432ee1e2359d4143d7a6925cefee1b5.tar.gz | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index b003f324ca3169..b8dc4dbb391b66 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -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; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index 27538eea547b19..c87a80e9bcc6a8 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -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"; |