diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-05-23 18:50:12 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2013-05-31 10:52:37 -0400 |
commit | d5c669f13759e790caf158d319641757768713be (patch) | |
tree | 6abb99f73bfd28d5befa5ee1445750c62e3d7a8e /arch | |
parent | 2432d201468da6e4dee41f4ac49023bc997e61e5 (diff) |
ARM: at91: dt: add Calao USB-A9G20 low power version
the low power version have a mmc-spi
eanble mmc-spi and RV3029C2 RTC in at91_dt_defconfig
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/usb_a9g20.dts | 18 | ||||
-rw-r--r-- | arch/arm/boot/dts/usb_a9g20_common.dtsi | 27 | ||||
-rw-r--r-- | arch/arm/boot/dts/usb_a9g20_lpw.dts | 31 | ||||
-rw-r--r-- | arch/arm/configs/at91_dt_defconfig | 2 |
5 files changed, 62 insertions, 17 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 342c1d7d48e1..ba0b00a057d5 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek_2mmc.dtb | |||
22 | dtb-$(CONFIG_ARCH_AT91) += kizbox.dtb | 22 | dtb-$(CONFIG_ARCH_AT91) += kizbox.dtb |
23 | dtb-$(CONFIG_ARCH_AT91) += tny_a9g20.dtb | 23 | dtb-$(CONFIG_ARCH_AT91) += tny_a9g20.dtb |
24 | dtb-$(CONFIG_ARCH_AT91) += usb_a9g20.dtb | 24 | dtb-$(CONFIG_ARCH_AT91) += usb_a9g20.dtb |
25 | dtb-$(CONFIG_ARCH_AT91) += usb_a9g20_lpw.dtb | ||
25 | # sam9g45 | 26 | # sam9g45 |
26 | dtb-$(CONFIG_ARCH_AT91) += at91sam9m10g45ek.dtb | 27 | dtb-$(CONFIG_ARCH_AT91) += at91sam9m10g45ek.dtb |
27 | dtb-$(CONFIG_ARCH_AT91) += pm9g45.dtb | 28 | dtb-$(CONFIG_ARCH_AT91) += pm9g45.dtb |
diff --git a/arch/arm/boot/dts/usb_a9g20.dts b/arch/arm/boot/dts/usb_a9g20.dts index c979c06cf697..ec77cf8f9695 100644 --- a/arch/arm/boot/dts/usb_a9g20.dts +++ b/arch/arm/boot/dts/usb_a9g20.dts | |||
@@ -6,25 +6,9 @@ | |||
6 | * Licensed under GPLv2 or later. | 6 | * Licensed under GPLv2 or later. |
7 | */ | 7 | */ |
8 | /dts-v1/; | 8 | /dts-v1/; |
9 | #include "at91sam9g20.dtsi" | 9 | #include "usb_a9g20_common.dtsi" |
10 | #include "usb_a9260_common.dtsi" | ||
11 | 10 | ||
12 | / { | 11 | / { |
13 | model = "Calao USB A9G20"; | 12 | model = "Calao USB A9G20"; |
14 | compatible = "calao,usb-a9g20", "atmel,at91sam9g20", "atmel,at91sam9"; | 13 | compatible = "calao,usb-a9g20", "atmel,at91sam9g20", "atmel,at91sam9"; |
15 | |||
16 | chosen { | ||
17 | bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs"; | ||
18 | }; | ||
19 | |||
20 | memory { | ||
21 | reg = <0x20000000 0x4000000>; | ||
22 | }; | ||
23 | |||
24 | i2c@0 { | ||
25 | rv3029c2@56 { | ||
26 | compatible = "rv3029c2"; | ||
27 | reg = <0x56>; | ||
28 | }; | ||
29 | }; | ||
30 | }; | 14 | }; |
diff --git a/arch/arm/boot/dts/usb_a9g20_common.dtsi b/arch/arm/boot/dts/usb_a9g20_common.dtsi new file mode 100644 index 000000000000..0b3b36182fe5 --- /dev/null +++ b/arch/arm/boot/dts/usb_a9g20_common.dtsi | |||
@@ -0,0 +1,27 @@ | |||
1 | /* | ||
2 | * usb_a9g20.dts - Device Tree file for Caloa USB A9G20 board | ||
3 | * | ||
4 | * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | ||
5 | * | ||
6 | * Licensed under GPLv2 or later. | ||
7 | */ | ||
8 | |||
9 | #include "at91sam9g20.dtsi" | ||
10 | #include "usb_a9260_common.dtsi" | ||
11 | |||
12 | / { | ||
13 | chosen { | ||
14 | bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs"; | ||
15 | }; | ||
16 | |||
17 | memory { | ||
18 | reg = <0x20000000 0x4000000>; | ||
19 | }; | ||
20 | |||
21 | i2c@0 { | ||
22 | rv3029c2@56 { | ||
23 | compatible = "rv3029c2"; | ||
24 | reg = <0x56>; | ||
25 | }; | ||
26 | }; | ||
27 | }; | ||
diff --git a/arch/arm/boot/dts/usb_a9g20_lpw.dts b/arch/arm/boot/dts/usb_a9g20_lpw.dts new file mode 100644 index 000000000000..f8cb1b9a01c5 --- /dev/null +++ b/arch/arm/boot/dts/usb_a9g20_lpw.dts | |||
@@ -0,0 +1,31 @@ | |||
1 | /* | ||
2 | * usb_a9g20_lpw.dts - Device Tree file for Caloa USB A9G20 Low Power board | ||
3 | * | ||
4 | * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | ||
5 | * | ||
6 | * Licensed under GPLv2 or later. | ||
7 | */ | ||
8 | /dts-v1/; | ||
9 | #include "usb_a9g20_common.dtsi" | ||
10 | |||
11 | / { | ||
12 | model = "Calao USB A9G20 Low Power"; | ||
13 | compatible = "calao,usb-a9g20-lpw", "calao,usb-a9g20", "atmel,at91sam9g20", "atmel,at91sam9"; | ||
14 | |||
15 | ahb { | ||
16 | apb { | ||
17 | spi1: spi@fffcc000 { | ||
18 | cs-gpios = <&pioB 3 GPIO_ACTIVE_HIGH>; | ||
19 | status = "okay"; | ||
20 | mmc-slot@0 { | ||
21 | compatible = "mmc-spi-slot"; | ||
22 | reg = <0>; | ||
23 | voltage-ranges = <3200 3400>; | ||
24 | spi-max-frequency = <25000000>; | ||
25 | interrupt-parent = <&pioC>; | ||
26 | interrupts = <4 IRQ_TYPE_EDGE_BOTH>; | ||
27 | }; | ||
28 | }; | ||
29 | }; | ||
30 | }; | ||
31 | }; | ||
diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig index a8800d361805..75fd842d4071 100644 --- a/arch/arm/configs/at91_dt_defconfig +++ b/arch/arm/configs/at91_dt_defconfig | |||
@@ -161,6 +161,7 @@ CONFIG_USB_ATMEL_USBA=y | |||
161 | CONFIG_USB_G_SERIAL=y | 161 | CONFIG_USB_G_SERIAL=y |
162 | CONFIG_MMC=y | 162 | CONFIG_MMC=y |
163 | CONFIG_MMC_ATMELMCI=y | 163 | CONFIG_MMC_ATMELMCI=y |
164 | CONFIG_MMC_SPI=y | ||
164 | CONFIG_NEW_LEDS=y | 165 | CONFIG_NEW_LEDS=y |
165 | CONFIG_LEDS_CLASS=y | 166 | CONFIG_LEDS_CLASS=y |
166 | CONFIG_LEDS_GPIO=y | 167 | CONFIG_LEDS_GPIO=y |
@@ -169,6 +170,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y | |||
169 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 170 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
170 | CONFIG_LEDS_TRIGGER_GPIO=y | 171 | CONFIG_LEDS_TRIGGER_GPIO=y |
171 | CONFIG_RTC_CLASS=y | 172 | CONFIG_RTC_CLASS=y |
173 | CONFIG_RTC_DRV_RV3029C2=y | ||
172 | CONFIG_RTC_DRV_AT91RM9200=y | 174 | CONFIG_RTC_DRV_AT91RM9200=y |
173 | CONFIG_RTC_DRV_AT91SAM9=y | 175 | CONFIG_RTC_DRV_AT91SAM9=y |
174 | CONFIG_DMADEVICES=y | 176 | CONFIG_DMADEVICES=y |