| From cac3cb911a0508c55373415365728187cd71243d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 26 Jan 2022 04:49:54 +0000 |
| Subject: arm64: dts: meson-g12: drop BL32 region from SEI510/SEI610 |
| |
| From: Christian Hewitt <christianshewitt@gmail.com> |
| |
| [ Upstream commit f26573e2bc9dfd551a0d5c6971f18cc546543312 ] |
| |
| The BL32/TEE reserved-memory region is now inherited from the common |
| family dtsi (meson-g12-common) so we can drop it from board files. |
| |
| Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> |
| Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> |
| Reviewed-by: Kevin Hilman <khilman@baylibre.com> |
| Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> |
| Link: https://lore.kernel.org/r/20220126044954.19069-4-christianshewitt@gmail.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 8 -------- |
| arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 8 -------- |
| 2 files changed, 16 deletions(-) |
| |
| diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts |
| index b8d9e92197ac8..c76bf498ee388 100644 |
| --- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts |
| +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts |
| @@ -157,14 +157,6 @@ |
| regulator-always-on; |
| }; |
| |
| - reserved-memory { |
| - /* TEE Reserved Memory */ |
| - bl32_reserved: bl32@5000000 { |
| - reg = <0x0 0x05300000 0x0 0x2000000>; |
| - no-map; |
| - }; |
| - }; |
| - |
| sdio_pwrseq: sdio-pwrseq { |
| compatible = "mmc-pwrseq-simple"; |
| reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; |
| diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts |
| index 29ac78ddc057e..85fb59060cdff 100644 |
| --- a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts |
| +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts |
| @@ -164,14 +164,6 @@ |
| regulator-always-on; |
| }; |
| |
| - reserved-memory { |
| - /* TEE Reserved Memory */ |
| - bl32_reserved: bl32@5000000 { |
| - reg = <0x0 0x05300000 0x0 0x2000000>; |
| - no-map; |
| - }; |
| - }; |
| - |
| sdio_pwrseq: sdio-pwrseq { |
| compatible = "mmc-pwrseq-simple"; |
| reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; |
| -- |
| 2.34.1 |
| |
