diff options
| author | Lee Jones <lee.jones@linaro.org> | 2013-05-31 16:15:51 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-06-04 11:16:17 +0200 |
| commit | 2388af4e9b190cef9fb24e49654010fcbd0ecf97 (patch) | |
| tree | e9ef8a4decbbbdac7f8103561b24ac0582c4d870 /arch/arm/boot/dts/ccu8540.dts | |
| parent | ef95f7ff0fb19785355f2e8ecf83d65b79ec0f51 (diff) | |
ARM: ux500: Allocate correct amount of memory for the u8540 in DT
As it stands, the memory node in the u8540 Device Tree is ignored and
memory is actually stipulated by the bootloader via ATAGS. ARM core
architecture code then extracts the memory ATAG and inserts it into the
Device Tree. In the u8540 the LittleKernel bootloader only stipulates
512MB of memory; however, the u8540 actually has 2GB. We're taking the
responsibility to register the remainder from Device Tree here.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/ccu8540.dts')
| -rw-r--r-- | arch/arm/boot/dts/ccu8540.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/ccu8540.dts b/arch/arm/boot/dts/ccu8540.dts index 17b0fe1dd764..48ff03441f5a 100644 --- a/arch/arm/boot/dts/ccu8540.dts +++ b/arch/arm/boot/dts/ccu8540.dts @@ -16,8 +16,8 @@ model = "ST-Ericsson U8540 platform with Device Tree"; compatible = "st-ericsson,ccu8540", "st-ericsson,u8540"; - memory { - reg = <0x00000000 0x20000000>; + memory@0 { + reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>; }; soc { |