diff options
author | Krzysztof Kozlowski <krzk@kernel.org> | 2018-07-09 18:05:19 +0200 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2018-07-09 18:50:53 +0200 |
commit | 8ab11f8068ef57e5763e1cc91b3dfe23a2482e68 (patch) | |
tree | d77fd31acfe4e2e90bed59c28e964911017cf4ce /arch/arm/boot/dts/Makefile | |
parent | 35a21229f8e0b461b1db7ab96a4ef390b42b13d2 (diff) | |
download | linux-stable-8ab11f8068ef57e5763e1cc91b3dfe23a2482e68.tar.gz linux-stable-8ab11f8068ef57e5763e1cc91b3dfe23a2482e68.tar.bz2 linux-stable-8ab11f8068ef57e5763e1cc91b3dfe23a2482e68.zip |
ARM: tegra: Work safely with 256 MB Colibri-T20 modules
Colibri-T20 can come in 256 MB RAM (with 512 MB NAND) or 512 MB RAM
(with 1024 MB NAND) flavors. Both of them will use the same DTSI
expecting the bootloader to do the fixup of /memory node. However in
case it does not happen, let's stay on safe side by limiting the memory
to 256 MB for both versions of Colibri-T20.
Rename to remove the unnecessary memory size from the device tree file
name. While at it, also follow the typical Toradex SoC, module, carrier
board hierarchy.
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Stefan Agner <stefan@agner.ch>
Tested-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 37a3de760d40..5daf9ef53cd2 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1039,7 +1039,7 @@ dtb-$(CONFIG_ARCH_TANGO) += \ tango4-vantage-1172.dtb dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \ tegra20-harmony.dtb \ - tegra20-iris-512.dtb \ + tegra20-colibri-iris.dtb \ tegra20-medcom-wide.dtb \ tegra20-paz00.dtb \ tegra20-plutux.dtb \ |