diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2013-06-28 10:39:15 +0200 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2013-08-14 09:56:31 +0200 |
| commit | a57603ca2871ee0773b00839c1ea35c4a2d3eeb0 (patch) | |
| tree | cef6c5c1e6161056e9004e58d55ed74893805009 /arch | |
| parent | b524f389702a908aa0e045dff2b79465b1084b88 (diff) | |
| download | linux-stable-a57603ca2871ee0773b00839c1ea35c4a2d3eeb0.tar.gz linux-stable-a57603ca2871ee0773b00839c1ea35c4a2d3eeb0.tar.bz2 linux-stable-a57603ca2871ee0773b00839c1ea35c4a2d3eeb0.zip | |
ARM: at91/DT: fix at91sam9n12ek memory node
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: stable <stable@vger.kernel.org> # 3.5+
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9n12ek.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts index d59b70c6a6a0..3d77dbe406f4 100644 --- a/arch/arm/boot/dts/at91sam9n12ek.dts +++ b/arch/arm/boot/dts/at91sam9n12ek.dts @@ -14,11 +14,11 @@ compatible = "atmel,at91sam9n12ek", "atmel,at91sam9n12", "atmel,at91sam9"; chosen { - bootargs = "mem=128M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2"; + bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2"; }; memory { - reg = <0x20000000 0x10000000>; + reg = <0x20000000 0x8000000>; }; clocks { |