diff options
author | sedji gaouaou <sedji.gaouaou@atmel.com> | 2008-07-10 05:15:35 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-10 07:13:47 -0400 |
commit | 613526677a74c2b3d1b1696ea7334b2cf35155b3 (patch) | |
tree | 785ec10351bceedc278bba66a54c212f8e3d5f54 /arch/arm | |
parent | 16074b669ea97e2bef494ec7cceb475566f763e3 (diff) |
[ARM] 5130/4: Support for the at91sam9g20
Support for the at91sam9g20 : Atmel 400Mhz ARM 926ej-s SOC.
AT91sam9g20 is an evolution of the at91sam9260 with a faster clock
speed.
We created a new board for this device but based the chip support
directly on 9260 files with little updates.
Here is the chip page on Atmel wabsite:
http://atmel.com/dyn/products/product_card.asp?part_id=4337
Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
Signed-off-by: Justin Waters <justin.waters@timesys.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-at91/Kconfig | 29 | ||||
-rw-r--r-- | arch/arm/mach-at91/Makefile | 4 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9260.c | 16 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9260_devices.c | 44 | ||||
-rw-r--r-- | arch/arm/mach-at91/board-sam9g20ek.c | 218 | ||||
-rw-r--r-- | arch/arm/mach-at91/clock.c | 19 | ||||
-rw-r--r-- | arch/arm/mach-at91/pm.c | 2 | ||||
-rw-r--r-- | arch/arm/mm/Kconfig | 4 |
8 files changed, 313 insertions, 23 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index cae5c67dc31..5bad6b9b00d 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
@@ -30,6 +30,11 @@ config ARCH_AT91SAM9RL | |||
30 | select GENERIC_TIME | 30 | select GENERIC_TIME |
31 | select GENERIC_CLOCKEVENTS | 31 | select GENERIC_CLOCKEVENTS |
32 | 32 | ||
33 | config ARCH_AT91SAM9G20 | ||
34 | bool "AT91SAM9G20" | ||
35 | select GENERIC_TIME | ||
36 | select GENERIC_CLOCKEVENTS | ||
37 | |||
33 | config ARCH_AT91CAP9 | 38 | config ARCH_AT91CAP9 |
34 | bool "AT91CAP9" | 39 | bool "AT91CAP9" |
35 | select GENERIC_TIME | 40 | select GENERIC_TIME |
@@ -239,6 +244,20 @@ endif | |||
239 | 244 | ||
240 | # ---------------------------------------------------------- | 245 | # ---------------------------------------------------------- |
241 | 246 | ||
247 | if ARCH_AT91SAM9G20 | ||
248 | |||
249 | comment "AT91SAM9G20 Board Type" | ||
250 | |||
251 | config MACH_AT91SAM9G20EK | ||
252 | bool "Atmel AT91SAM9G20-EK Evaluation Kit" | ||
253 | depends on ARCH_AT91SAM9G20 | ||
254 | help | ||
255 | Select this if you are using Atmel's AT91SAM9G20-EK Evaluation Kit. | ||
256 | |||
257 | endif | ||
258 | |||
259 | # ---------------------------------------------------------- | ||
260 | |||
242 | if ARCH_AT91CAP9 | 261 | if ARCH_AT91CAP9 |
243 | 262 | ||
244 | comment "AT91CAP9 Board Type" | 263 | comment "AT91CAP9 Board Type" |
@@ -274,13 +293,13 @@ comment "AT91 Board Options" | |||
274 | 293 | ||
275 | config MTD_AT91_DATAFLASH_CARD | 294 | config MTD_AT91_DATAFLASH_CARD |
276 | bool "Enable DataFlash Card support" | 295 | bool "Enable DataFlash Card support" |
277 | depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9263EK || MACH_AT91CAP9ADK || MACH_SAM9_L9260 || MACH_ECBAT91) | 296 | depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_ECBAT91 || MACH_SAM9_L9260 || MACH_AT91CAP9ADK) |
278 | help | 297 | help |
279 | Enable support for the DataFlash card. | 298 | Enable support for the DataFlash card. |
280 | 299 | ||
281 | config MTD_NAND_AT91_BUSWIDTH_16 | 300 | config MTD_NAND_AT91_BUSWIDTH_16 |
282 | bool "Enable 16-bit data bus interface to NAND flash" | 301 | bool "Enable 16-bit data bus interface to NAND flash" |
283 | depends on (MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9263EK || MACH_AT91CAP9ADK) | 302 | depends on (MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_AT91CAP9ADK) |
284 | help | 303 | help |
285 | On AT91SAM926x boards both types of NAND flash can be present | 304 | On AT91SAM926x boards both types of NAND flash can be present |
286 | (8 and 16 bit data bus width). | 305 | (8 and 16 bit data bus width). |
@@ -329,15 +348,15 @@ config AT91_EARLY_USART2 | |||
329 | 348 | ||
330 | config AT91_EARLY_USART3 | 349 | config AT91_EARLY_USART3 |
331 | bool "USART3" | 350 | bool "USART3" |
332 | depends on (ARCH_AT91RM9200 || ARCH_AT91SAM9RL || ARCH_AT91SAM9260) | 351 | depends on (ARCH_AT91RM9200 || ARCH_AT91SAM9RL || ARCH_AT91SAM9260 || ARCH_AT91SAM9G20) |
333 | 352 | ||
334 | config AT91_EARLY_USART4 | 353 | config AT91_EARLY_USART4 |
335 | bool "USART4" | 354 | bool "USART4" |
336 | depends on ARCH_AT91SAM9260 | 355 | depends on ARCH_AT91SAM9260 || ARCH_AT91SAM9G20 |
337 | 356 | ||
338 | config AT91_EARLY_USART5 | 357 | config AT91_EARLY_USART5 |
339 | bool "USART5" | 358 | bool "USART5" |
340 | depends on ARCH_AT91SAM9260 | 359 | depends on ARCH_AT91SAM9260 || ARCH_AT91SAM9G20 |
341 | 360 | ||
342 | endchoice | 361 | endchoice |
343 | 362 | ||
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 932d17109e8..7d641f97516 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile | |||
@@ -15,6 +15,7 @@ obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260.o at91sam926x_time.o at91sam9260_d | |||
15 | obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o | 15 | obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o |
16 | obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o | 16 | obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o |
17 | obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o | 17 | obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o |
18 | obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o | ||
18 | obj-$(CONFIG_ARCH_AT91CAP9) += at91cap9.o at91sam926x_time.o at91cap9_devices.o | 19 | obj-$(CONFIG_ARCH_AT91CAP9) += at91cap9.o at91sam926x_time.o at91cap9_devices.o |
19 | obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o | 20 | obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o |
20 | 21 | ||
@@ -49,6 +50,9 @@ obj-$(CONFIG_MACH_USB_A9263) += board-usb-a9263.o | |||
49 | # AT91SAM9RL board-specific support | 50 | # AT91SAM9RL board-specific support |
50 | obj-$(CONFIG_MACH_AT91SAM9RLEK) += board-sam9rlek.o | 51 | obj-$(CONFIG_MACH_AT91SAM9RLEK) += board-sam9rlek.o |
51 | 52 | ||
53 | # AT91SAM9G20 board-specific support | ||
54 | obj-$(CONFIG_MACH_AT91SAM9G20EK) += board-sam9g20ek.o | ||
55 | |||
52 | # AT91CAP9 board-specific support | 56 | # AT91CAP9 board-specific support |
53 | obj-$(CONFIG_MACH_AT91CAP9ADK) += board-cap9adk.o | 57 | obj-$(CONFIG_MACH_AT91CAP9ADK) += board-cap9adk.o |
54 | 58 | ||
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index ee26550cdc2..380f12a1220 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c | |||
@@ -47,6 +47,20 @@ static struct map_desc at91sam9260_sram_desc[] __initdata = { | |||
47 | } | 47 | } |
48 | }; | 48 | }; |
49 | 49 | ||
50 | static struct map_desc at91sam9g20_sram_desc[] __initdata = { | ||
51 | { | ||
52 | .virtual = AT91_IO_VIRT_BASE - AT91SAM9G20_SRAM0_SIZE, | ||
53 | .pfn = __phys_to_pfn(AT91SAM9G20_SRAM0_BASE), | ||
54 | .length = AT91SAM9G20_SRAM0_SIZE, | ||
55 | .type = MT_DEVICE, | ||
56 | }, { | ||
57 | .virtual = AT91_IO_VIRT_BASE - AT91SAM9G20_SRAM0_SIZE - AT91SAM9G20_SRAM1_SIZE, | ||
58 | .pfn = __phys_to_pfn(AT91SAM9G20_SRAM1_BASE), | ||
59 | .length = AT91SAM9G20_SRAM1_SIZE, | ||
60 | .type = MT_DEVICE, | ||
61 | } | ||
62 | }; | ||
63 | |||
50 | static struct map_desc at91sam9xe_sram_desc[] __initdata = { | 64 | static struct map_desc at91sam9xe_sram_desc[] __initdata = { |
51 | { | 65 | { |
52 | .pfn = __phys_to_pfn(AT91SAM9XE_SRAM_BASE), | 66 | .pfn = __phys_to_pfn(AT91SAM9XE_SRAM_BASE), |
@@ -307,6 +321,8 @@ void __init at91sam9260_initialize(unsigned long main_clock) | |||
307 | 321 | ||
308 | if (cpu_is_at91sam9xe()) | 322 | if (cpu_is_at91sam9xe()) |
309 | at91sam9xe_initialize(); | 323 | at91sam9xe_initialize(); |
324 | else if (cpu_is_at91sam9g20()) | ||
325 | iotable_init(at91sam9g20_sram_desc, ARRAY_SIZE(at91sam9g20_sram_desc)); | ||
310 | else | 326 | else |
311 | iotable_init(at91sam9260_sram_desc, ARRAY_SIZE(at91sam9260_sram_desc)); | 327 | iotable_init(at91sam9260_sram_desc, ARRAY_SIZE(at91sam9260_sram_desc)); |
312 | 328 | ||
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index 26f5cacbec3..86cba4ac29b 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c | |||
@@ -18,6 +18,7 @@ | |||
18 | 18 | ||
19 | #include <asm/arch/board.h> | 19 | #include <asm/arch/board.h> |
20 | #include <asm/arch/gpio.h> | 20 | #include <asm/arch/gpio.h> |
21 | #include <asm/arch/cpu.h> | ||
21 | #include <asm/arch/at91sam9260.h> | 22 | #include <asm/arch/at91sam9260.h> |
22 | #include <asm/arch/at91sam9260_matrix.h> | 23 | #include <asm/arch/at91sam9260_matrix.h> |
23 | #include <asm/arch/at91sam9_smc.h> | 24 | #include <asm/arch/at91sam9_smc.h> |
@@ -320,20 +321,41 @@ void __init at91_add_device_nand(struct at91_nand_data *data) | |||
320 | csa = at91_sys_read(AT91_MATRIX_EBICSA); | 321 | csa = at91_sys_read(AT91_MATRIX_EBICSA); |
321 | at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA); | 322 | at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA); |
322 | 323 | ||
323 | /* set the bus interface characteristics */ | 324 | if (cpu_is_at91sam9260()) { |
324 | at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(1) | AT91_SMC_NCS_WRSETUP_(0) | 325 | /* Timing for sam9260 */ |
325 | | AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0)); | 326 | /* set the bus interface characteristics */ |
327 | at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(1) | AT91_SMC_NCS_WRSETUP_(0) | ||
328 | | AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0)); | ||
326 | 329 | ||
327 | at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) | 330 | at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) |
328 | | AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3)); | 331 | | AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3)); |
329 | 332 | ||
330 | at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5)); | 333 | at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5)); |
331 | 334 | ||
332 | if (data->bus_width_16) | 335 | if (data->bus_width_16) |
333 | mode = AT91_SMC_DBW_16; | 336 | mode = AT91_SMC_DBW_16; |
334 | else | 337 | else |
335 | mode = AT91_SMC_DBW_8; | 338 | mode = AT91_SMC_DBW_8; |
336 | at91_sys_write(AT91_SMC_MODE(3), mode | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(2)); | 339 | at91_sys_write(AT91_SMC_MODE(3), mode | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(2)); |
340 | } | ||
341 | |||
342 | if (cpu_is_at91sam9g20()) { | ||
343 | /* Timing for sam9g20 */ | ||
344 | /* set the bus interface characteristics */ | ||
345 | at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(2) | AT91_SMC_NCS_WRSETUP_(0) | ||
346 | | AT91_SMC_NRDSETUP_(2) | AT91_SMC_NCS_RDSETUP_(0)); | ||
347 | |||
348 | at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(4) | ||
349 | | AT91_SMC_NRDPULSE_(4) | AT91_SMC_NCS_RDPULSE_(4)); | ||
350 | |||
351 | at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(7) | AT91_SMC_NRDCYCLE_(7)); | ||
352 | |||
353 | if (data->bus_width_16) | ||
354 | mode = AT91_SMC_DBW_16; | ||
355 | else | ||
356 | mode = AT91_SMC_DBW_8; | ||
357 | at91_sys_write(AT91_SMC_MODE(3), mode | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(3)); | ||
358 | } | ||
337 | 359 | ||
338 | /* enable pin */ | 360 | /* enable pin */ |
339 | if (data->enable_pin) | 361 | if (data->enable_pin) |
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c new file mode 100644 index 00000000000..45617c20124 --- /dev/null +++ b/arch/arm/mach-at91/board-sam9g20ek.c | |||
@@ -0,0 +1,218 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2005 SAN People | ||
3 | * Copyright (C) 2008 Atmel | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or modify | ||
6 | * it under the terms of the GNU General Public License as published by | ||
7 | * the Free Software Foundation; either version 2 of the License, or | ||
8 | * (at your option) any later version. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | * GNU General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program; if not, write to the Free Software | ||
17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
18 | */ | ||
19 | |||
20 | #include <linux/types.h> | ||
21 | #include <linux/init.h> | ||
22 | #include <linux/mm.h> | ||
23 | #include <linux/module.h> | ||
24 | #include <linux/platform_device.h> | ||
25 | #include <linux/spi/spi.h> | ||
26 | #include <linux/spi/at73c213.h> | ||
27 | #include <linux/clk.h> | ||
28 | |||
29 | #include <asm/hardware.h> | ||
30 | #include <asm/setup.h> | ||
31 | #include <asm/mach-types.h> | ||
32 | #include <asm/irq.h> | ||
33 | |||
34 | #include <asm/mach/arch.h> | ||
35 | #include <asm/mach/map.h> | ||
36 | #include <asm/mach/irq.h> | ||
37 | |||
38 | #include <asm/arch/board.h> | ||
39 | #include <asm/arch/gpio.h> | ||
40 | |||
41 | #include "generic.h" | ||
42 | |||
43 | |||
44 | static void __init ek_map_io(void) | ||
45 | { | ||
46 | /* Initialize processor: 18.432 MHz crystal */ | ||
47 | at91sam9260_initialize(18432000); | ||
48 | |||
49 | /* DGBU on ttyS0. (Rx & Tx only) */ | ||
50 | at91_register_uart(0, 0, 0); | ||
51 | |||
52 | /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ | ||
53 | at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS | ||
54 | | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD | ||
55 | | ATMEL_UART_RI); | ||
56 | |||
57 | /* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */ | ||
58 | at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS); | ||
59 | |||
60 | /* set serial console to ttyS0 (ie, DBGU) */ | ||
61 | at91_set_serial_console(0); | ||
62 | } | ||
63 | |||
64 | static void __init ek_init_irq(void) | ||
65 | { | ||
66 | at91sam9260_init_interrupts(NULL); | ||
67 | } | ||
68 | |||
69 | |||
70 | /* | ||
71 | * USB Host port | ||
72 | */ | ||
73 | static struct at91_usbh_data __initdata ek_usbh_data = { | ||
74 | .ports = 2, | ||
75 | }; | ||
76 | |||
77 | /* | ||
78 | * USB Device port | ||
79 | */ | ||
80 | static struct at91_udc_data __initdata ek_udc_data = { | ||
81 | .vbus_pin = AT91_PIN_PC5, | ||
82 | .pullup_pin = 0, /* pull-up driven by UDC */ | ||
83 | }; | ||
84 | |||
85 | |||
86 | /* | ||
87 | * SPI devices. | ||
88 | */ | ||
89 | static struct spi_board_info ek_spi_devices[] = { | ||
90 | #if !defined(CONFIG_MMC_AT91) | ||
91 | { /* DataFlash chip */ | ||
92 | .modalias = "mtd_dataflash", | ||
93 | .chip_select = 1, | ||
94 | .max_speed_hz = 15 * 1000 * 1000, | ||
95 | .bus_num = 0, | ||
96 | }, | ||
97 | #if defined(CONFIG_MTD_AT91_DATAFLASH_CARD) | ||
98 | { /* DataFlash card */ | ||
99 | .modalias = "mtd_dataflash", | ||
100 | .chip_select = 0, | ||
101 | .max_speed_hz = 15 * 1000 * 1000, | ||
102 | .bus_num = 0, | ||
103 | }, | ||
104 | #endif | ||
105 | #endif | ||
106 | }; | ||
107 | |||
108 | |||
109 | /* | ||
110 | * MACB Ethernet device | ||
111 | */ | ||
112 | static struct at91_eth_data __initdata ek_macb_data = { | ||
113 | .phy_irq_pin = AT91_PIN_PA7, | ||
114 | .is_rmii = 1, | ||
115 | }; | ||
116 | |||
117 | |||
118 | /* | ||
119 | * NAND flash | ||
120 | */ | ||
121 | static struct mtd_partition __initdata ek_nand_partition[] = { | ||
122 | { | ||
123 | .name = "Bootstrap", | ||
124 | .offset = 0, | ||
125 | .size = 4 * 1024 * 1024, | ||
126 | }, | ||
127 | { | ||
128 | .name = "Partition 1", | ||
129 | .offset = 4 * 1024 * 1024, | ||
130 | .size = 60 * 1024 * 1024, | ||
131 | }, | ||
132 | { | ||
133 | .name = "Partition 2", | ||
134 | .offset = 64 * 1024 * 1024, | ||
135 | .size = MTDPART_SIZ_FULL, | ||
136 | }, | ||
137 | }; | ||
138 | |||
139 | static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) | ||
140 | { | ||
141 | *num_partitions = ARRAY_SIZE(ek_nand_partition); | ||
142 | return ek_nand_partition; | ||
143 | } | ||
144 | |||
145 | /* det_pin is not connected */ | ||
146 | static struct at91_nand_data __initdata ek_nand_data = { | ||
147 | .ale = 21, | ||
148 | .cle = 22, | ||
149 | .rdy_pin = AT91_PIN_PC13, | ||
150 | .enable_pin = AT91_PIN_PC14, | ||
151 | .partition_info = nand_partitions, | ||
152 | #if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16) | ||
153 | .bus_width_16 = 1, | ||
154 | #else | ||
155 | .bus_width_16 = 0, | ||
156 | #endif | ||
157 | }; | ||
158 | |||
159 | |||
160 | /* | ||
161 | * MCI (SD/MMC) | ||
162 | * det_pin, wp_pin and vcc_pin are not connected | ||
163 | */ | ||
164 | static struct at91_mmc_data __initdata ek_mmc_data = { | ||
165 | .slot_b = 1, | ||
166 | .wire4 = 1, | ||
167 | }; | ||
168 | |||
169 | |||
170 | /* | ||
171 | * LEDs | ||
172 | */ | ||
173 | static struct gpio_led ek_leds[] = { | ||
174 | { /* "bottom" led, green, userled1 to be defined */ | ||
175 | .name = "ds5", | ||
176 | .gpio = AT91_PIN_PA6, | ||
177 | .active_low = 1, | ||
178 | .default_trigger = "none", | ||
179 | }, | ||
180 | { /* "power" led, yellow */ | ||
181 | .name = "ds1", | ||
182 | .gpio = AT91_PIN_PA9, | ||
183 | .default_trigger = "heartbeat", | ||
184 | } | ||
185 | }; | ||
186 | |||
187 | static void __init ek_board_init(void) | ||
188 | { | ||
189 | /* Serial */ | ||
190 | at91_add_device_serial(); | ||
191 | /* USB Host */ | ||
192 | at91_add_device_usbh(&ek_usbh_data); | ||
193 | /* USB Device */ | ||
194 | at91_add_device_udc(&ek_udc_data); | ||
195 | /* SPI */ | ||
196 | at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices)); | ||
197 | /* NAND */ | ||
198 | at91_add_device_nand(&ek_nand_data); | ||
199 | /* Ethernet */ | ||
200 | at91_add_device_eth(&ek_macb_data); | ||
201 | /* MMC */ | ||
202 | at91_add_device_mmc(0, &ek_mmc_data); | ||
203 | /* I2C */ | ||
204 | at91_add_device_i2c(NULL, 0); | ||
205 | /* LEDs */ | ||
206 | at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds)); | ||
207 | } | ||
208 | |||
209 | MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK") | ||
210 | /* Maintainer: Atmel */ | ||
211 | .phys_io = AT91_BASE_SYS, | ||
212 | .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc, | ||
213 | .boot_params = AT91_SDRAM_BASE + 0x100, | ||
214 | .timer = &at91sam926x_timer, | ||
215 | .map_io = ek_map_io, | ||
216 | .init_irq = ek_init_irq, | ||
217 | .init_machine = ek_board_init, | ||
218 | MACHINE_END | ||
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c index e8ce8f0f3ed..464bdbbf74d 100644 --- a/arch/arm/mach-at91/clock.c +++ b/arch/arm/mach-at91/clock.c | |||
@@ -515,14 +515,19 @@ static unsigned __init at91_pll_calc(unsigned main_freq, unsigned out_freq) | |||
515 | /* | 515 | /* |
516 | * PLL input between 1MHz and 32MHz per spec, but lower | 516 | * PLL input between 1MHz and 32MHz per spec, but lower |
517 | * frequences seem necessary in some cases so allow 100K. | 517 | * frequences seem necessary in some cases so allow 100K. |
518 | * Warning: some newer products need 2MHz min. | ||
518 | */ | 519 | */ |
519 | input = main_freq / i; | 520 | input = main_freq / i; |
521 | if (cpu_is_at91sam9g20() && input < 2000000) | ||
522 | continue; | ||
520 | if (input < 100000) | 523 | if (input < 100000) |
521 | continue; | 524 | continue; |
522 | if (input > 32000000) | 525 | if (input > 32000000) |
523 | continue; | 526 | continue; |
524 | 527 | ||
525 | mul1 = out_freq / input; | 528 | mul1 = out_freq / input; |
529 | if (cpu_is_at91sam9g20() && mul > 63) | ||
530 | continue; | ||
526 | if (mul1 > 2048) | 531 | if (mul1 > 2048) |
527 | continue; | 532 | continue; |
528 | if (mul1 < 2) | 533 | if (mul1 < 2) |
@@ -582,7 +587,8 @@ int __init at91_clock_init(unsigned long main_clock) | |||
582 | 587 | ||
583 | /* report if PLLA is more than mildly overclocked */ | 588 | /* report if PLLA is more than mildly overclocked */ |
584 | plla.rate_hz = at91_pll_rate(&plla, main_clock, at91_sys_read(AT91_CKGR_PLLAR)); | 589 | plla.rate_hz = at91_pll_rate(&plla, main_clock, at91_sys_read(AT91_CKGR_PLLAR)); |
585 | if (plla.rate_hz > 209000000) | 590 | if ((!cpu_is_at91sam9g20() && plla.rate_hz > 209000000) |
591 | || (cpu_is_at91sam9g20() && plla.rate_hz > 800000000)) | ||
586 | pr_info("Clocks: PLLA overclocked, %ld MHz\n", plla.rate_hz / 1000000); | 592 | pr_info("Clocks: PLLA overclocked, %ld MHz\n", plla.rate_hz / 1000000); |
587 | 593 | ||
588 | /* | 594 | /* |
@@ -597,7 +603,7 @@ int __init at91_clock_init(unsigned long main_clock) | |||
597 | uhpck.pmc_mask = AT91RM9200_PMC_UHP; | 603 | uhpck.pmc_mask = AT91RM9200_PMC_UHP; |
598 | udpck.pmc_mask = AT91RM9200_PMC_UDP; | 604 | udpck.pmc_mask = AT91RM9200_PMC_UDP; |
599 | at91_sys_write(AT91_PMC_SCER, AT91RM9200_PMC_MCKUDP); | 605 | at91_sys_write(AT91_PMC_SCER, AT91RM9200_PMC_MCKUDP); |
600 | } else if (cpu_is_at91sam9260() || cpu_is_at91sam9261() || cpu_is_at91sam9263()) { | 606 | } else if (cpu_is_at91sam9260() || cpu_is_at91sam9261() || cpu_is_at91sam9263() || cpu_is_at91sam9g20()) { |
601 | uhpck.pmc_mask = AT91SAM926x_PMC_UHP; | 607 | uhpck.pmc_mask = AT91SAM926x_PMC_UHP; |
602 | udpck.pmc_mask = AT91SAM926x_PMC_UDP; | 608 | udpck.pmc_mask = AT91SAM926x_PMC_UDP; |
603 | } else if (cpu_is_at91cap9()) { | 609 | } else if (cpu_is_at91cap9()) { |
@@ -629,8 +635,13 @@ int __init at91_clock_init(unsigned long main_clock) | |||
629 | freq /= (1 << ((mckr & AT91_PMC_PRES) >> 2)); /* prescale */ | 635 | freq /= (1 << ((mckr & AT91_PMC_PRES) >> 2)); /* prescale */ |
630 | if (cpu_is_at91rm9200()) | 636 | if (cpu_is_at91rm9200()) |
631 | mck.rate_hz = freq / (1 + ((mckr & AT91_PMC_MDIV) >> 8)); /* mdiv */ | 637 | mck.rate_hz = freq / (1 + ((mckr & AT91_PMC_MDIV) >> 8)); /* mdiv */ |
632 | else | 638 | else if (cpu_is_at91sam9g20()) { |
633 | mck.rate_hz = freq / (1 << ((mckr & AT91_PMC_MDIV) >> 8)); /* mdiv */ | 639 | mck.rate_hz = (mckr & AT91_PMC_MDIV) ? |
640 | freq / ((mckr & AT91_PMC_MDIV) >> 7) : freq; /* mdiv ; (x >> 7) = ((x >> 8) * 2) */ | ||
641 | if (mckr & AT91_PMC_PDIV) | ||
642 | freq /= 2; /* processor clock division */ | ||
643 | } else | ||
644 | mck.rate_hz = freq / (1 << ((mckr & AT91_PMC_MDIV) >> 8)); /* mdiv */ | ||
634 | 645 | ||
635 | /* Register the PMC's standard clocks */ | 646 | /* Register the PMC's standard clocks */ |
636 | for (i = 0; i < ARRAY_SIZE(standard_pmc_clocks); i++) | 647 | for (i = 0; i < ARRAY_SIZE(standard_pmc_clocks); i++) |
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index aa863c15770..8ab4feb1ec5 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c | |||
@@ -202,7 +202,7 @@ static int at91_pm_verify_clocks(void) | |||
202 | pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n"); | 202 | pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n"); |
203 | return 0; | 203 | return 0; |
204 | } | 204 | } |
205 | } else if (cpu_is_at91sam9260() || cpu_is_at91sam9261() || cpu_is_at91sam9263()) { | 205 | } else if (cpu_is_at91sam9260() || cpu_is_at91sam9261() || cpu_is_at91sam9263() || cpu_is_at91sam9g20()) { |
206 | if ((scsr & (AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP)) != 0) { | 206 | if ((scsr & (AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP)) != 0) { |
207 | pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n"); | 207 | pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n"); |
208 | return 0; | 208 | return 0; |
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 33ed048502a..750d895cd28 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -180,8 +180,8 @@ config CPU_ARM925T | |||
180 | # ARM926T | 180 | # ARM926T |
181 | config CPU_ARM926T | 181 | config CPU_ARM926T |
182 | bool "Support ARM926T processor" | 182 | bool "Support ARM926T processor" |
183 | depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || MACH_REALVIEW_EB || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI | 183 | depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || MACH_REALVIEW_EB || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI |
184 | default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI | 184 | default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI |
185 | select CPU_32v5 | 185 | select CPU_32v5 |
186 | select CPU_ABRT_EV5TJ | 186 | select CPU_ABRT_EV5TJ |
187 | select CPU_PABRT_NOIFAR | 187 | select CPU_PABRT_NOIFAR |