diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-02-21 08:38:18 -0500 |
---|---|---|
committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-03-15 11:29:19 -0400 |
commit | 86a89f4ff665d385741a7831c612fc0b9aa22480 (patch) | |
tree | a69357560740d3157dd76f79fb6a5891d8cf02ff /arch | |
parent | d6a016616ba834b7da7653effb98d413acde7aa2 (diff) |
ARM: at91: sam9x5 add nand support
Enable the nand in the cpu module with the partition.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/at91sam9g25ek.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9x5.dtsi | 15 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9x5cm.dtsi | 34 |
3 files changed, 50 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9g25ek.dts b/arch/arm/boot/dts/at91sam9g25ek.dts index e64eb932083b..c7596bf26388 100644 --- a/arch/arm/boot/dts/at91sam9g25ek.dts +++ b/arch/arm/boot/dts/at91sam9g25ek.dts | |||
@@ -15,7 +15,7 @@ | |||
15 | compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; | 15 | compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; |
16 | 16 | ||
17 | chosen { | 17 | chosen { |
18 | bootargs = "128M console=ttyS0,115200 mtdparts=atmel_nand:8M(bootstrap/uboot/kernel)ro,-(rootfs) root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"; | 18 | bootargs = "128M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"; |
19 | }; | 19 | }; |
20 | 20 | ||
21 | ahb { | 21 | ahb { |
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index a02e636d8a57..c294657a1f7e 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi | |||
@@ -172,5 +172,20 @@ | |||
172 | status = "disabled"; | 172 | status = "disabled"; |
173 | }; | 173 | }; |
174 | }; | 174 | }; |
175 | |||
176 | nand0: nand@40000000 { | ||
177 | compatible = "atmel,at91rm9200-nand"; | ||
178 | #address-cells = <1>; | ||
179 | #size-cells = <1>; | ||
180 | reg = <0x40000000 0x10000000 | ||
181 | >; | ||
182 | atmel,nand-addr-offset = <21>; | ||
183 | atmel,nand-cmd-offset = <22>; | ||
184 | gpios = <&pioC 8 0 | ||
185 | &pioC 14 0 | ||
186 | 0 | ||
187 | >; | ||
188 | status = "disabled"; | ||
189 | }; | ||
175 | }; | 190 | }; |
176 | }; | 191 | }; |
diff --git a/arch/arm/boot/dts/at91sam9x5cm.dtsi b/arch/arm/boot/dts/at91sam9x5cm.dtsi index 64ae3e890259..5b37033bed56 100644 --- a/arch/arm/boot/dts/at91sam9x5cm.dtsi +++ b/arch/arm/boot/dts/at91sam9x5cm.dtsi | |||
@@ -12,6 +12,40 @@ | |||
12 | reg = <0x20000000 0x8000000>; | 12 | reg = <0x20000000 0x8000000>; |
13 | }; | 13 | }; |
14 | 14 | ||
15 | ahb { | ||
16 | nand0: nand@40000000 { | ||
17 | nand-bus-width = <8>; | ||
18 | nand-ecc-mode = "soft"; | ||
19 | nand-on-flash-bbt; | ||
20 | status = "okay"; | ||
21 | |||
22 | at91bootstrap@0 { | ||
23 | label = "at91bootstrap"; | ||
24 | reg = <0x0 0x40000>; | ||
25 | }; | ||
26 | |||
27 | uboot@40000 { | ||
28 | label = "u-boot"; | ||
29 | reg = <0x40000 0x80000>; | ||
30 | }; | ||
31 | |||
32 | ubootenv@c0000 { | ||
33 | label = "U-Boot Env"; | ||
34 | reg = <0xc0000 0x140000>; | ||
35 | }; | ||
36 | |||
37 | kernel@200000 { | ||
38 | label = "kernel"; | ||
39 | reg = <0x200000 0x600000>; | ||
40 | }; | ||
41 | |||
42 | rootfs@800000 { | ||
43 | label = "rootfs"; | ||
44 | reg = <0x800000 0x1f800000>; | ||
45 | }; | ||
46 | }; | ||
47 | }; | ||
48 | |||
15 | leds { | 49 | leds { |
16 | compatible = "gpio-leds"; | 50 | compatible = "gpio-leds"; |
17 | 51 | ||