diff options
author | Syed Mohammed Khasim <x0khasim@ti.com> | 2006-12-06 20:14:05 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2007-09-20 12:59:20 -0400 |
commit | 72d0f1c3cdc7c456e1e357359ec6f566d0a5f264 (patch) | |
tree | 1cebb2edf9fa1be79d991e7a61fa196d284d9a17 /arch/arm | |
parent | f604931238dff7b44ef52ac2ad1f557e45b25b38 (diff) |
ARM: OMAP: Add minimal OMAP2430 support
This patch adds minimal OMAP2430 support to get the kernel booting on 2430SDP.
Signed-off-by: Syed Mohammed Khasim <x0khasim@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/Kconfig | 9 | ||||
-rw-r--r-- | arch/arm/mach-omap2/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-2430sdp.c | 218 | ||||
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-omap2/id.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap2/io.c | 20 |
7 files changed, 265 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index cf4268e46b03..7069c9d536f1 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
@@ -11,6 +11,10 @@ config ARCH_OMAP2420 | |||
11 | select OMAP_DM_TIMER | 11 | select OMAP_DM_TIMER |
12 | select ARCH_OMAP_OTG | 12 | select ARCH_OMAP_OTG |
13 | 13 | ||
14 | config ARCH_OMAP2430 | ||
15 | bool "OMAP2430 support" | ||
16 | depends on ARCH_OMAP24XX | ||
17 | |||
14 | comment "OMAP Board Type" | 18 | comment "OMAP Board Type" |
15 | depends on ARCH_OMAP2 | 19 | depends on ARCH_OMAP2 |
16 | 20 | ||
@@ -26,3 +30,8 @@ config MACH_OMAP_H4 | |||
26 | config MACH_OMAP_APOLLON | 30 | config MACH_OMAP_APOLLON |
27 | bool "OMAP 2420 Apollon board" | 31 | bool "OMAP 2420 Apollon board" |
28 | depends on ARCH_OMAP2 && ARCH_OMAP24XX | 32 | depends on ARCH_OMAP2 && ARCH_OMAP24XX |
33 | |||
34 | config MACH_OMAP_2430SDP | ||
35 | bool "OMAP 2430 SDP board" | ||
36 | depends on ARCH_OMAP2 && ARCH_OMAP24XX | ||
37 | |||
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 266d88e77bdc..b05b738d31e6 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
@@ -14,5 +14,6 @@ obj-$(CONFIG_PM) += pm.o pm-domain.o sleep.o | |||
14 | # Specific board support | 14 | # Specific board support |
15 | obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o | 15 | obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o |
16 | obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o | 16 | obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o |
17 | obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o | ||
17 | obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o | 18 | obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o |
18 | 19 | ||
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c new file mode 100644 index 000000000000..7e76fbf19b5d --- /dev/null +++ b/arch/arm/mach-omap2/board-2430sdp.c | |||
@@ -0,0 +1,218 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/mach-omap2/board-2430sdp.c | ||
3 | * | ||
4 | * Copyright (C) 2006 Texas Instruments | ||
5 | * | ||
6 | * Modified from mach-omap2/board-generic.c | ||
7 | * | ||
8 | * Initial Code : Based on a patch from Komal Shah and Richard Woodruff | ||
9 | * Updated the Code for 2430 SDP : Syed Mohammed Khasim | ||
10 | * | ||
11 | * This program is free software; you can redistribute it and/or modify | ||
12 | * it under the terms of the GNU General Public License version 2 as | ||
13 | * published by the Free Software Foundation. | ||
14 | */ | ||
15 | |||
16 | #include <linux/kernel.h> | ||
17 | #include <linux/init.h> | ||
18 | #include <linux/platform_device.h> | ||
19 | #include <linux/mtd/mtd.h> | ||
20 | #include <linux/mtd/partitions.h> | ||
21 | #include <linux/delay.h> | ||
22 | #include <linux/err.h> | ||
23 | #include <linux/clk.h> | ||
24 | |||
25 | #include <asm/hardware.h> | ||
26 | #include <asm/mach-types.h> | ||
27 | #include <asm/mach/arch.h> | ||
28 | #include <asm/mach/map.h> | ||
29 | #include <asm/mach/flash.h> | ||
30 | |||
31 | #include <asm/arch/gpio.h> | ||
32 | #include <asm/arch/mux.h> | ||
33 | #include <asm/arch/board.h> | ||
34 | #include <asm/arch/common.h> | ||
35 | #include <asm/arch/gpmc.h> | ||
36 | #include "prcm-regs.h" | ||
37 | |||
38 | #include <asm/io.h> | ||
39 | |||
40 | |||
41 | #define SDP2430_FLASH_CS 0 | ||
42 | #define SDP2430_SMC91X_CS 5 | ||
43 | |||
44 | static struct mtd_partition sdp2430_partitions[] = { | ||
45 | /* bootloader (U-Boot, etc) in first sector */ | ||
46 | { | ||
47 | .name = "bootloader", | ||
48 | .offset = 0, | ||
49 | .size = SZ_256K, | ||
50 | .mask_flags = MTD_WRITEABLE, /* force read-only */ | ||
51 | }, | ||
52 | /* bootloader params in the next sector */ | ||
53 | { | ||
54 | .name = "params", | ||
55 | .offset = MTDPART_OFS_APPEND, | ||
56 | .size = SZ_128K, | ||
57 | .mask_flags = 0, | ||
58 | }, | ||
59 | /* kernel */ | ||
60 | { | ||
61 | .name = "kernel", | ||
62 | .offset = MTDPART_OFS_APPEND, | ||
63 | .size = SZ_2M, | ||
64 | .mask_flags = 0 | ||
65 | }, | ||
66 | /* file system */ | ||
67 | { | ||
68 | .name = "filesystem", | ||
69 | .offset = MTDPART_OFS_APPEND, | ||
70 | .size = MTDPART_SIZ_FULL, | ||
71 | .mask_flags = 0 | ||
72 | } | ||
73 | }; | ||
74 | |||
75 | static struct flash_platform_data sdp2430_flash_data = { | ||
76 | .map_name = "cfi_probe", | ||
77 | .width = 2, | ||
78 | .parts = sdp2430_partitions, | ||
79 | .nr_parts = ARRAY_SIZE(sdp2430_partitions), | ||
80 | }; | ||
81 | |||
82 | static struct resource sdp2430_flash_resource = { | ||
83 | .start = SDP2430_CS0_BASE, | ||
84 | .end = SDP2430_CS0_BASE + SZ_64M - 1, | ||
85 | .flags = IORESOURCE_MEM, | ||
86 | }; | ||
87 | |||
88 | static struct platform_device sdp2430_flash_device = { | ||
89 | .name = "omapflash", | ||
90 | .id = 0, | ||
91 | .dev = { | ||
92 | .platform_data = &sdp2430_flash_data, | ||
93 | }, | ||
94 | .num_resources = 1, | ||
95 | .resource = &sdp2430_flash_resource, | ||
96 | }; | ||
97 | |||
98 | static struct resource sdp2430_smc91x_resources[] = { | ||
99 | [0] = { | ||
100 | .start = SDP2430_CS0_BASE, | ||
101 | .end = SDP2430_CS0_BASE + SZ_64M - 1, | ||
102 | .flags = IORESOURCE_MEM, | ||
103 | }, | ||
104 | [1] = { | ||
105 | .start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), | ||
106 | .end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), | ||
107 | .flags = IORESOURCE_IRQ, | ||
108 | }, | ||
109 | }; | ||
110 | |||
111 | static struct platform_device sdp2430_smc91x_device = { | ||
112 | .name = "smc91x", | ||
113 | .id = -1, | ||
114 | .num_resources = ARRAY_SIZE(sdp2430_smc91x_resources), | ||
115 | .resource = sdp2430_smc91x_resources, | ||
116 | }; | ||
117 | |||
118 | static struct platform_device *sdp2430_devices[] __initdata = { | ||
119 | &sdp2430_smc91x_device, | ||
120 | &sdp2430_flash_device, | ||
121 | }; | ||
122 | |||
123 | static inline void __init sdp2430_init_smc91x(void) | ||
124 | { | ||
125 | int eth_cs; | ||
126 | unsigned long cs_mem_base; | ||
127 | unsigned int rate; | ||
128 | struct clk *l3ck; | ||
129 | |||
130 | eth_cs = SDP2430_SMC91X_CS; | ||
131 | |||
132 | l3ck = clk_get(NULL, "core_l3_ck"); | ||
133 | if (IS_ERR(l3ck)) | ||
134 | rate = 100000000; | ||
135 | else | ||
136 | rate = clk_get_rate(l3ck); | ||
137 | |||
138 | /* Make sure CS1 timings are correct, for 2430 always muxed */ | ||
139 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG1, 0x00011200); | ||
140 | |||
141 | if (rate >= 160000000) { | ||
142 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG2, 0x001f1f01); | ||
143 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG3, 0x00080803); | ||
144 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG4, 0x1c0b1c0a); | ||
145 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG5, 0x041f1F1F); | ||
146 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG6, 0x000004C4); | ||
147 | } else if (rate >= 130000000) { | ||
148 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG2, 0x001f1f00); | ||
149 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG3, 0x00080802); | ||
150 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG4, 0x1C091C09); | ||
151 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG5, 0x041f1F1F); | ||
152 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG6, 0x000004C4); | ||
153 | } else { /* rate = 100000000 */ | ||
154 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG2, 0x001f1f00); | ||
155 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG3, 0x00080802); | ||
156 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG4, 0x1C091C09); | ||
157 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG5, 0x031A1F1F); | ||
158 | gpmc_cs_write_reg(eth_cs, GPMC_CS_CONFIG6, 0x000003C2); | ||
159 | } | ||
160 | |||
161 | if (gpmc_cs_request(eth_cs, SZ_16M, &cs_mem_base) < 0) { | ||
162 | printk(KERN_ERR "Failed to request GPMC mem for smc91x\n"); | ||
163 | return; | ||
164 | } | ||
165 | |||
166 | sdp2430_smc91x_resources[0].start = cs_mem_base + 0x300; | ||
167 | sdp2430_smc91x_resources[0].end = cs_mem_base + 0x30f; | ||
168 | udelay(100); | ||
169 | |||
170 | if (omap_request_gpio(OMAP24XX_ETHR_GPIO_IRQ) < 0) { | ||
171 | printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n", | ||
172 | OMAP24XX_ETHR_GPIO_IRQ); | ||
173 | gpmc_cs_free(eth_cs); | ||
174 | return; | ||
175 | } | ||
176 | omap_set_gpio_direction(OMAP24XX_ETHR_GPIO_IRQ, 1); | ||
177 | |||
178 | } | ||
179 | |||
180 | static void __init omap_2430sdp_init_irq(void) | ||
181 | { | ||
182 | omap2_init_common_hw(); | ||
183 | omap_init_irq(); | ||
184 | omap_gpio_init(); | ||
185 | sdp2430_init_smc91x(); | ||
186 | } | ||
187 | |||
188 | static struct omap_uart_config sdp2430_uart_config __initdata = { | ||
189 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), | ||
190 | }; | ||
191 | |||
192 | static struct omap_board_config_kernel sdp2430_config[] = { | ||
193 | {OMAP_TAG_UART, &sdp2430_uart_config}, | ||
194 | }; | ||
195 | |||
196 | static void __init omap_2430sdp_init(void) | ||
197 | { | ||
198 | platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices)); | ||
199 | omap_board_config = sdp2430_config; | ||
200 | omap_board_config_size = ARRAY_SIZE(sdp2430_config); | ||
201 | omap_serial_init(); | ||
202 | } | ||
203 | |||
204 | static void __init omap_2430sdp_map_io(void) | ||
205 | { | ||
206 | omap2_map_common_io(); | ||
207 | } | ||
208 | |||
209 | MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board") | ||
210 | /* Maintainer: Syed Khasim - Texas Instruments Inc */ | ||
211 | .phys_io = 0x48000000, | ||
212 | .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, | ||
213 | .boot_params = 0x80000100, | ||
214 | .map_io = omap_2430sdp_map_io, | ||
215 | .init_irq = omap_2430sdp_init_irq, | ||
216 | .init_machine = omap_2430sdp_init, | ||
217 | .timer = &omap_timer, | ||
218 | MACHINE_END | ||
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 52ec2f2d6360..b603bc5f8e5b 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -55,8 +55,10 @@ static void omap_init_i2c(void) | |||
55 | if (machine_is_omap_h4()) | 55 | if (machine_is_omap_h4()) |
56 | return; | 56 | return; |
57 | 57 | ||
58 | omap_cfg_reg(J15_24XX_I2C2_SCL); | 58 | if (!cpu_is_omap2430()) { |
59 | omap_cfg_reg(H19_24XX_I2C2_SDA); | 59 | omap_cfg_reg(J15_24XX_I2C2_SCL); |
60 | omap_cfg_reg(H19_24XX_I2C2_SDA); | ||
61 | } | ||
60 | (void) platform_device_register(&omap_i2c_device2); | 62 | (void) platform_device_register(&omap_i2c_device2); |
61 | } | 63 | } |
62 | 64 | ||
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 6d6b25c46b1f..03595ee72ed3 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c | |||
@@ -22,7 +22,14 @@ | |||
22 | 22 | ||
23 | #undef DEBUG | 23 | #undef DEBUG |
24 | 24 | ||
25 | #ifdef CONFIG_ARCH_OMAP2420 | ||
25 | #define GPMC_BASE 0x6800a000 | 26 | #define GPMC_BASE 0x6800a000 |
27 | #endif | ||
28 | |||
29 | #ifdef CONFIG_ARCH_OMAP2430 | ||
30 | #define GPMC_BASE 0x6E000000 | ||
31 | #endif | ||
32 | |||
26 | #define GPMC_REVISION 0x00 | 33 | #define GPMC_REVISION 0x00 |
27 | #define GPMC_SYSCONFIG 0x10 | 34 | #define GPMC_SYSCONFIG 0x10 |
28 | #define GPMC_SYSSTATUS 0x14 | 35 | #define GPMC_SYSSTATUS 0x14 |
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 871ace4fccb8..4dfd878d7968 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c | |||
@@ -17,7 +17,13 @@ | |||
17 | 17 | ||
18 | #include <asm/io.h> | 18 | #include <asm/io.h> |
19 | 19 | ||
20 | #if defined(CONFIG_ARCH_OMAP2420) | ||
20 | #define OMAP24XX_TAP_BASE io_p2v(0x48014000) | 21 | #define OMAP24XX_TAP_BASE io_p2v(0x48014000) |
22 | #endif | ||
23 | |||
24 | #if defined(CONFIG_ARCH_OMAP2430) | ||
25 | #define OMAP24XX_TAP_BASE io_p2v(0x4900A000) | ||
26 | #endif | ||
21 | 27 | ||
22 | #define OMAP_TAP_IDCODE 0x0204 | 28 | #define OMAP_TAP_IDCODE 0x0204 |
23 | #define OMAP_TAP_PROD_ID 0x0208 | 29 | #define OMAP_TAP_PROD_ID 0x0208 |
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index a57a4295ce23..5a4091f582ed 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
@@ -5,6 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Copyright (C) 2005 Nokia Corporation | 6 | * Copyright (C) 2005 Nokia Corporation |
7 | * Author: Juha Yrjölä <juha.yrjola@nokia.com> | 7 | * Author: Juha Yrjölä <juha.yrjola@nokia.com> |
8 | * Updated map desc to add 2430 support : <x0khasim@ti.com> | ||
8 | * | 9 | * |
9 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
10 | * it under the terms of the GNU General Public License version 2 as | 11 | * it under the terms of the GNU General Public License version 2 as |
@@ -41,6 +42,20 @@ static struct map_desc omap2_io_desc[] __initdata = { | |||
41 | .length = L3_24XX_SIZE, | 42 | .length = L3_24XX_SIZE, |
42 | .type = MT_DEVICE | 43 | .type = MT_DEVICE |
43 | }, | 44 | }, |
45 | #ifdef CONFIG_ARCH_OMAP2430 | ||
46 | { | ||
47 | .virtual = L4_WK_243X_VIRT, | ||
48 | .pfn = __phys_to_pfn(L4_WK_243X_PHYS), | ||
49 | .length = L4_WK_243X_SIZE, | ||
50 | .type = MT_DEVICE | ||
51 | }, | ||
52 | { | ||
53 | .virtual = OMAP243X_GPMC_VIRT, | ||
54 | .pfn = __phys_to_pfn(OMAP243X_GPMC_PHYS), | ||
55 | .length = OMAP243X_GPMC_SIZE, | ||
56 | .type = MT_DEVICE | ||
57 | }, | ||
58 | #endif | ||
44 | { | 59 | { |
45 | .virtual = DSP_MEM_24XX_VIRT, | 60 | .virtual = DSP_MEM_24XX_VIRT, |
46 | .pfn = __phys_to_pfn(DSP_MEM_24XX_PHYS), | 61 | .pfn = __phys_to_pfn(DSP_MEM_24XX_PHYS), |
@@ -81,6 +96,11 @@ void __init omap2_init_common_hw(void) | |||
81 | { | 96 | { |
82 | omap2_mux_init(); | 97 | omap2_mux_init(); |
83 | omap2_clk_init(); | 98 | omap2_clk_init(); |
99 | /* | ||
100 | * Need to Fix this for 2430 | ||
101 | */ | ||
102 | #ifndef CONFIG_ARCH_OMAP2430 | ||
84 | omap2_init_memory(); | 103 | omap2_init_memory(); |
104 | #endif | ||
85 | gpmc_init(); | 105 | gpmc_init(); |
86 | } | 106 | } |