diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-15 22:52:56 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-15 22:53:14 -0700 |
| commit | eb6095b246264c47bd14a7d825d3d2b92d443d44 (patch) | |
| tree | 1cd6e756416784511555faa3a1780778f72953b7 /arch/arm/boot/dts/at91sam9n12ek.dts | |
| parent | 3554c229c2b306a7e75013e2f8b861b6dd915516 (diff) | |
| parent | a57603ca2871ee0773b00839c1ea35c4a2d3eeb0 (diff) | |
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
From Nicolas Ferre:
Device tree related fixes:
- USB host numbering for 9x5 which was preventing from using all ports
- a missing UART (not USART) clock lookup table was preventing from using
them on 9x5
- too large amount of memory was specified for 9n12ek
* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
ARM: at91/DT: fix at91sam9n12ek memory node
ARM: at91: add missing uart clocks DT entries
ARM: at91/DT: at91sam9x5ek: fix USB host property to enable port C
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9n12ek.dts')
| -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 { |