diff options
author | Bryan Wu <bryan.wu@analog.com> | 2007-10-10 13:20:06 -0400 |
---|---|---|
committer | Bryan Wu <bryan.wu@analog.com> | 2007-10-10 13:20:06 -0400 |
commit | c6c4d7bbbb498c38afa05688dfc2784948a0c4e2 (patch) | |
tree | 9ebefb1b6c6ceff6e83eda3dfcbd616a725ecced /arch/blackfin | |
parent | bbf25010f1a6b761914430f5fca081ec8c7accd1 (diff) |
Blackfin arch: update platform driver resource information to all board files
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'arch/blackfin')
-rw-r--r-- | arch/blackfin/mach-bf533/boards/cm_bf533.c | 81 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/ezkit.c | 91 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/stamp.c | 119 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/cm_bf537.c | 87 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/generic_board.c | 397 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/pnav10.c | 53 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 142 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 477 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/boards/cm_bf561.c | 84 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/boards/ezkit.c | 82 |
10 files changed, 1448 insertions, 165 deletions
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c index 4545f363e641..a57b52d207cd 100644 --- a/arch/blackfin/mach-bf533/boards/cm_bf533.c +++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c | |||
@@ -34,7 +34,9 @@ | |||
34 | #include <linux/spi/spi.h> | 34 | #include <linux/spi/spi.h> |
35 | #include <linux/spi/flash.h> | 35 | #include <linux/spi/flash.h> |
36 | #include <linux/usb_isp1362.h> | 36 | #include <linux/usb_isp1362.h> |
37 | #include <linux/pata_platform.h> | ||
37 | #include <linux/irq.h> | 38 | #include <linux/irq.h> |
39 | #include <asm/dma.h> | ||
38 | #include <asm/bfin5xx_spi.h> | 40 | #include <asm/bfin5xx_spi.h> |
39 | 41 | ||
40 | /* | 42 | /* |
@@ -93,7 +95,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
93 | /* the modalias must be the same as spi device driver name */ | 95 | /* the modalias must be the same as spi device driver name */ |
94 | .modalias = "m25p80", /* Name of spi_driver for this device */ | 96 | .modalias = "m25p80", /* Name of spi_driver for this device */ |
95 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 97 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ |
96 | .bus_num = 1, /* Framework bus number */ | 98 | .bus_num = 0, /* Framework bus number */ |
97 | .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/ | 99 | .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/ |
98 | .platform_data = &bfin_spi_flash_data, | 100 | .platform_data = &bfin_spi_flash_data, |
99 | .controller_data = &spi_flash_chip_info, | 101 | .controller_data = &spi_flash_chip_info, |
@@ -101,7 +103,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
101 | }, { | 103 | }, { |
102 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ | 104 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ |
103 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ | 105 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ |
104 | .bus_num = 1, /* Framework bus number */ | 106 | .bus_num = 0, /* Framework bus number */ |
105 | .chip_select = 2, /* Framework chip select. */ | 107 | .chip_select = 2, /* Framework chip select. */ |
106 | .platform_data = NULL, /* No spi_driver specific config */ | 108 | .platform_data = NULL, /* No spi_driver specific config */ |
107 | .controller_data = &spi_adc_chip_info, | 109 | .controller_data = &spi_adc_chip_info, |
@@ -110,24 +112,40 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
110 | { | 112 | { |
111 | .modalias = "ad1836-spi", | 113 | .modalias = "ad1836-spi", |
112 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 114 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
113 | .bus_num = 1, | 115 | .bus_num = 0, |
114 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 116 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
115 | .controller_data = &ad1836_spi_chip_info, | 117 | .controller_data = &ad1836_spi_chip_info, |
116 | }, | 118 | }, |
117 | #endif | 119 | #endif |
118 | }; | 120 | }; |
119 | 121 | ||
122 | /* SPI (0) */ | ||
123 | static struct resource bfin_spi0_resource[] = { | ||
124 | [0] = { | ||
125 | .start = SPI0_REGBASE, | ||
126 | .end = SPI0_REGBASE + 0xFF, | ||
127 | .flags = IORESOURCE_MEM, | ||
128 | }, | ||
129 | [1] = { | ||
130 | .start = CH_SPI, | ||
131 | .end = CH_SPI, | ||
132 | .flags = IORESOURCE_IRQ, | ||
133 | } | ||
134 | }; | ||
135 | |||
120 | /* SPI controller data */ | 136 | /* SPI controller data */ |
121 | static struct bfin5xx_spi_master spi_bfin_master_info = { | 137 | static struct bfin5xx_spi_master bfin_spi0_info = { |
122 | .num_chipselect = 8, | 138 | .num_chipselect = 8, |
123 | .enable_dma = 1, /* master has the ability to do dma transfer */ | 139 | .enable_dma = 1, /* master has the ability to do dma transfer */ |
124 | }; | 140 | }; |
125 | 141 | ||
126 | static struct platform_device spi_bfin_master_device = { | 142 | static struct platform_device bfin_spi0_device = { |
127 | .name = "bfin-spi-master", | 143 | .name = "bfin-spi", |
128 | .id = 1, /* Bus number */ | 144 | .id = 0, /* Bus number */ |
145 | .num_resources = ARRAY_SIZE(bfin_spi0_resource), | ||
146 | .resource = bfin_spi0_resource, | ||
129 | .dev = { | 147 | .dev = { |
130 | .platform_data = &spi_bfin_master_info, /* Passed to driver */ | 148 | .platform_data = &bfin_spi0_info, /* Passed to driver */ |
131 | }, | 149 | }, |
132 | }; | 150 | }; |
133 | #endif /* spi master and devices */ | 151 | #endif /* spi master and devices */ |
@@ -227,6 +245,43 @@ static struct platform_device isp1362_hcd_device = { | |||
227 | }; | 245 | }; |
228 | #endif | 246 | #endif |
229 | 247 | ||
248 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
249 | #define PATA_INT 38 | ||
250 | |||
251 | static struct pata_platform_info bfin_pata_platform_data = { | ||
252 | .ioport_shift = 2, | ||
253 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
254 | }; | ||
255 | |||
256 | static struct resource bfin_pata_resources[] = { | ||
257 | { | ||
258 | .start = 0x2030C000, | ||
259 | .end = 0x2030C01F, | ||
260 | .flags = IORESOURCE_MEM, | ||
261 | }, | ||
262 | { | ||
263 | .start = 0x2030D018, | ||
264 | .end = 0x2030D01B, | ||
265 | .flags = IORESOURCE_MEM, | ||
266 | }, | ||
267 | { | ||
268 | .start = PATA_INT, | ||
269 | .end = PATA_INT, | ||
270 | .flags = IORESOURCE_IRQ, | ||
271 | }, | ||
272 | }; | ||
273 | |||
274 | static struct platform_device bfin_pata_device = { | ||
275 | .name = "pata_platform", | ||
276 | .id = -1, | ||
277 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
278 | .resource = bfin_pata_resources, | ||
279 | .dev = { | ||
280 | .platform_data = &bfin_pata_platform_data, | ||
281 | } | ||
282 | }; | ||
283 | #endif | ||
284 | |||
230 | static struct platform_device *cm_bf533_devices[] __initdata = { | 285 | static struct platform_device *cm_bf533_devices[] __initdata = { |
231 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 286 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) |
232 | &bfin_uart_device, | 287 | &bfin_uart_device, |
@@ -250,7 +305,11 @@ static struct platform_device *cm_bf533_devices[] __initdata = { | |||
250 | #endif | 305 | #endif |
251 | 306 | ||
252 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 307 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
253 | &spi_bfin_master_device, | 308 | &bfin_spi0_device, |
309 | #endif | ||
310 | |||
311 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
312 | &bfin_pata_device, | ||
254 | #endif | 313 | #endif |
255 | }; | 314 | }; |
256 | 315 | ||
@@ -261,6 +320,10 @@ static int __init cm_bf533_init(void) | |||
261 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 320 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
262 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 321 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
263 | #endif | 322 | #endif |
323 | |||
324 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
325 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
326 | #endif | ||
264 | return 0; | 327 | return 0; |
265 | } | 328 | } |
266 | 329 | ||
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c index 0000b8f1239c..5c1e35d3c012 100644 --- a/arch/blackfin/mach-bf533/boards/ezkit.c +++ b/arch/blackfin/mach-bf533/boards/ezkit.c | |||
@@ -35,7 +35,9 @@ | |||
35 | #include <linux/spi/spi.h> | 35 | #include <linux/spi/spi.h> |
36 | #include <linux/spi/flash.h> | 36 | #include <linux/spi/flash.h> |
37 | #include <linux/usb_isp1362.h> | 37 | #include <linux/usb_isp1362.h> |
38 | #include <linux/pata_platform.h> | ||
38 | #include <linux/irq.h> | 39 | #include <linux/irq.h> |
40 | #include <asm/dma.h> | ||
39 | #include <asm/bfin5xx_spi.h> | 41 | #include <asm/bfin5xx_spi.h> |
40 | 42 | ||
41 | /* | 43 | /* |
@@ -50,6 +52,12 @@ static struct platform_device rtc_device = { | |||
50 | }; | 52 | }; |
51 | #endif | 53 | #endif |
52 | 54 | ||
55 | #if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE) | ||
56 | static struct platform_device bfin_fb_adv7393_device = { | ||
57 | .name = "bfin-adv7393", | ||
58 | }; | ||
59 | #endif | ||
60 | |||
53 | /* | 61 | /* |
54 | * USB-LAN EzExtender board | 62 | * USB-LAN EzExtender board |
55 | * Driver needs to know address, irq and flag pin. | 63 | * Driver needs to know address, irq and flag pin. |
@@ -131,7 +139,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
131 | /* the modalias must be the same as spi device driver name */ | 139 | /* the modalias must be the same as spi device driver name */ |
132 | .modalias = "m25p80", /* Name of spi_driver for this device */ | 140 | .modalias = "m25p80", /* Name of spi_driver for this device */ |
133 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 141 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ |
134 | .bus_num = 1, /* Framework bus number */ | 142 | .bus_num = 0, /* Framework bus number */ |
135 | .chip_select = 2, /* Framework chip select. On STAMP537 it is SPISSEL2*/ | 143 | .chip_select = 2, /* Framework chip select. On STAMP537 it is SPISSEL2*/ |
136 | .platform_data = &bfin_spi_flash_data, | 144 | .platform_data = &bfin_spi_flash_data, |
137 | .controller_data = &spi_flash_chip_info, | 145 | .controller_data = &spi_flash_chip_info, |
@@ -143,7 +151,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
143 | { | 151 | { |
144 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ | 152 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ |
145 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ | 153 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ |
146 | .bus_num = 1, /* Framework bus number */ | 154 | .bus_num = 0, /* Framework bus number */ |
147 | .chip_select = 1, /* Framework chip select. */ | 155 | .chip_select = 1, /* Framework chip select. */ |
148 | .platform_data = NULL, /* No spi_driver specific config */ | 156 | .platform_data = NULL, /* No spi_driver specific config */ |
149 | .controller_data = &spi_adc_chip_info, | 157 | .controller_data = &spi_adc_chip_info, |
@@ -154,24 +162,40 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
154 | { | 162 | { |
155 | .modalias = "ad1836-spi", | 163 | .modalias = "ad1836-spi", |
156 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 164 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
157 | .bus_num = 1, | 165 | .bus_num = 0, |
158 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 166 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
159 | .controller_data = &ad1836_spi_chip_info, | 167 | .controller_data = &ad1836_spi_chip_info, |
160 | }, | 168 | }, |
161 | #endif | 169 | #endif |
162 | }; | 170 | }; |
163 | 171 | ||
172 | /* SPI (0) */ | ||
173 | static struct resource bfin_spi0_resource[] = { | ||
174 | [0] = { | ||
175 | .start = SPI0_REGBASE, | ||
176 | .end = SPI0_REGBASE + 0xFF, | ||
177 | .flags = IORESOURCE_MEM, | ||
178 | }, | ||
179 | [1] = { | ||
180 | .start = CH_SPI, | ||
181 | .end = CH_SPI, | ||
182 | .flags = IORESOURCE_IRQ, | ||
183 | } | ||
184 | }; | ||
185 | |||
164 | /* SPI controller data */ | 186 | /* SPI controller data */ |
165 | static struct bfin5xx_spi_master spi_bfin_master_info = { | 187 | static struct bfin5xx_spi_master bfin_spi0_info = { |
166 | .num_chipselect = 8, | 188 | .num_chipselect = 8, |
167 | .enable_dma = 1, /* master has the ability to do dma transfer */ | 189 | .enable_dma = 1, /* master has the ability to do dma transfer */ |
168 | }; | 190 | }; |
169 | 191 | ||
170 | static struct platform_device spi_bfin_master_device = { | 192 | static struct platform_device bfin_spi0_device = { |
171 | .name = "bfin-spi-master", | 193 | .name = "bfin-spi", |
172 | .id = 1, /* Bus number */ | 194 | .id = 0, /* Bus number */ |
195 | .num_resources = ARRAY_SIZE(bfin_spi0_resource), | ||
196 | .resource = bfin_spi0_resource, | ||
173 | .dev = { | 197 | .dev = { |
174 | .platform_data = &spi_bfin_master_info, /* Passed to driver */ | 198 | .platform_data = &bfin_spi0_info, /* Passed to driver */ |
175 | }, | 199 | }, |
176 | }; | 200 | }; |
177 | #endif /* spi master and devices */ | 201 | #endif /* spi master and devices */ |
@@ -193,13 +217,54 @@ static struct platform_device bfin_uart_device = { | |||
193 | }; | 217 | }; |
194 | #endif | 218 | #endif |
195 | 219 | ||
220 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
221 | #define PATA_INT 55 | ||
222 | |||
223 | static struct pata_platform_info bfin_pata_platform_data = { | ||
224 | .ioport_shift = 1, | ||
225 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
226 | }; | ||
227 | |||
228 | static struct resource bfin_pata_resources[] = { | ||
229 | { | ||
230 | .start = 0x20314020, | ||
231 | .end = 0x2031403F, | ||
232 | .flags = IORESOURCE_MEM, | ||
233 | }, | ||
234 | { | ||
235 | .start = 0x2031401C, | ||
236 | .end = 0x2031401F, | ||
237 | .flags = IORESOURCE_MEM, | ||
238 | }, | ||
239 | { | ||
240 | .start = PATA_INT, | ||
241 | .end = PATA_INT, | ||
242 | .flags = IORESOURCE_IRQ, | ||
243 | }, | ||
244 | }; | ||
245 | |||
246 | static struct platform_device bfin_pata_device = { | ||
247 | .name = "pata_platform", | ||
248 | .id = -1, | ||
249 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
250 | .resource = bfin_pata_resources, | ||
251 | .dev = { | ||
252 | .platform_data = &bfin_pata_platform_data, | ||
253 | } | ||
254 | }; | ||
255 | #endif | ||
256 | |||
196 | static struct platform_device *ezkit_devices[] __initdata = { | 257 | static struct platform_device *ezkit_devices[] __initdata = { |
197 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | 258 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) |
198 | &smc91x_device, | 259 | &smc91x_device, |
199 | #endif | 260 | #endif |
200 | 261 | ||
201 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 262 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
202 | &spi_bfin_master_device, | 263 | &bfin_spi0_device, |
264 | #endif | ||
265 | |||
266 | #if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE) | ||
267 | &bfin_fb_adv7393_device, | ||
203 | #endif | 268 | #endif |
204 | 269 | ||
205 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | 270 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) |
@@ -209,6 +274,10 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
209 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 274 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) |
210 | &bfin_uart_device, | 275 | &bfin_uart_device, |
211 | #endif | 276 | #endif |
277 | |||
278 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
279 | &bfin_pata_device, | ||
280 | #endif | ||
212 | }; | 281 | }; |
213 | 282 | ||
214 | static int __init ezkit_init(void) | 283 | static int __init ezkit_init(void) |
@@ -218,6 +287,10 @@ static int __init ezkit_init(void) | |||
218 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 287 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
219 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 288 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
220 | #endif | 289 | #endif |
290 | |||
291 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
292 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
293 | #endif | ||
221 | return 0; | 294 | return 0; |
222 | } | 295 | } |
223 | 296 | ||
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c index a9143c4cbdcd..8975e06ea158 100644 --- a/arch/blackfin/mach-bf533/boards/stamp.c +++ b/arch/blackfin/mach-bf533/boards/stamp.c | |||
@@ -37,8 +37,11 @@ | |||
37 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 37 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
38 | #include <linux/usb_isp1362.h> | 38 | #include <linux/usb_isp1362.h> |
39 | #endif | 39 | #endif |
40 | #include <linux/pata_platform.h> | ||
40 | #include <linux/irq.h> | 41 | #include <linux/irq.h> |
42 | #include <asm/dma.h> | ||
41 | #include <asm/bfin5xx_spi.h> | 43 | #include <asm/bfin5xx_spi.h> |
44 | #include <asm/reboot.h> | ||
42 | 45 | ||
43 | /* | 46 | /* |
44 | * Name the Board for the /proc/cpuinfo | 47 | * Name the Board for the /proc/cpuinfo |
@@ -77,6 +80,12 @@ static struct platform_device smc91x_device = { | |||
77 | }; | 80 | }; |
78 | #endif | 81 | #endif |
79 | 82 | ||
83 | #if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE) | ||
84 | static struct platform_device bfin_fb_adv7393_device = { | ||
85 | .name = "bfin-adv7393", | ||
86 | }; | ||
87 | #endif | ||
88 | |||
80 | #if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) | 89 | #if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) |
81 | static struct resource net2272_bfin_resources[] = { | 90 | static struct resource net2272_bfin_resources[] = { |
82 | { | 91 | { |
@@ -177,7 +186,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
177 | /* the modalias must be the same as spi device driver name */ | 186 | /* the modalias must be the same as spi device driver name */ |
178 | .modalias = "m25p80", /* Name of spi_driver for this device */ | 187 | .modalias = "m25p80", /* Name of spi_driver for this device */ |
179 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 188 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ |
180 | .bus_num = 1, /* Framework bus number */ | 189 | .bus_num = 0, /* Framework bus number */ |
181 | .chip_select = 2, /* Framework chip select. On STAMP537 it is SPISSEL2*/ | 190 | .chip_select = 2, /* Framework chip select. On STAMP537 it is SPISSEL2*/ |
182 | .platform_data = &bfin_spi_flash_data, | 191 | .platform_data = &bfin_spi_flash_data, |
183 | .controller_data = &spi_flash_chip_info, | 192 | .controller_data = &spi_flash_chip_info, |
@@ -189,7 +198,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
189 | { | 198 | { |
190 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ | 199 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ |
191 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ | 200 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ |
192 | .bus_num = 1, /* Framework bus number */ | 201 | .bus_num = 0, /* Framework bus number */ |
193 | .chip_select = 1, /* Framework chip select. */ | 202 | .chip_select = 1, /* Framework chip select. */ |
194 | .platform_data = NULL, /* No spi_driver specific config */ | 203 | .platform_data = NULL, /* No spi_driver specific config */ |
195 | .controller_data = &spi_adc_chip_info, | 204 | .controller_data = &spi_adc_chip_info, |
@@ -200,7 +209,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
200 | { | 209 | { |
201 | .modalias = "ad1836-spi", | 210 | .modalias = "ad1836-spi", |
202 | .max_speed_hz = 31250000, /* max spi clock (SCK) speed in HZ */ | 211 | .max_speed_hz = 31250000, /* max spi clock (SCK) speed in HZ */ |
203 | .bus_num = 1, | 212 | .bus_num = 0, |
204 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 213 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
205 | .controller_data = &ad1836_spi_chip_info, | 214 | .controller_data = &ad1836_spi_chip_info, |
206 | }, | 215 | }, |
@@ -210,7 +219,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
210 | { | 219 | { |
211 | .modalias = "spi_mmc_dummy", | 220 | .modalias = "spi_mmc_dummy", |
212 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 221 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ |
213 | .bus_num = 1, | 222 | .bus_num = 0, |
214 | .chip_select = 0, | 223 | .chip_select = 0, |
215 | .platform_data = NULL, | 224 | .platform_data = NULL, |
216 | .controller_data = &spi_mmc_chip_info, | 225 | .controller_data = &spi_mmc_chip_info, |
@@ -219,7 +228,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
219 | { | 228 | { |
220 | .modalias = "spi_mmc", | 229 | .modalias = "spi_mmc", |
221 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 230 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ |
222 | .bus_num = 1, | 231 | .bus_num = 0, |
223 | .chip_select = CONFIG_SPI_MMC_CS_CHAN, | 232 | .chip_select = CONFIG_SPI_MMC_CS_CHAN, |
224 | .platform_data = NULL, | 233 | .platform_data = NULL, |
225 | .controller_data = &spi_mmc_chip_info, | 234 | .controller_data = &spi_mmc_chip_info, |
@@ -231,16 +240,16 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
231 | { | 240 | { |
232 | .modalias = "fxs-spi", | 241 | .modalias = "fxs-spi", |
233 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | 242 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ |
234 | .bus_num = 1, | 243 | .bus_num = 0, |
235 | .chip_select = 3, | 244 | .chip_select = 8 - CONFIG_J11_JUMPER, |
236 | .controller_data = &spi_si3xxx_chip_info, | 245 | .controller_data = &spi_si3xxx_chip_info, |
237 | .mode = SPI_MODE_3, | 246 | .mode = SPI_MODE_3, |
238 | }, | 247 | }, |
239 | { | 248 | { |
240 | .modalias = "fxo-spi", | 249 | .modalias = "fxo-spi", |
241 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | 250 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ |
242 | .bus_num = 1, | 251 | .bus_num = 0, |
243 | .chip_select = 2, | 252 | .chip_select = 8 - CONFIG_J19_JUMPER, |
244 | .controller_data = &spi_si3xxx_chip_info, | 253 | .controller_data = &spi_si3xxx_chip_info, |
245 | .mode = SPI_MODE_3, | 254 | .mode = SPI_MODE_3, |
246 | }, | 255 | }, |
@@ -250,7 +259,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
250 | { | 259 | { |
251 | .modalias = "ad5304_spi", | 260 | .modalias = "ad5304_spi", |
252 | .max_speed_hz = 1000000, /* max spi clock (SCK) speed in HZ */ | 261 | .max_speed_hz = 1000000, /* max spi clock (SCK) speed in HZ */ |
253 | .bus_num = 1, | 262 | .bus_num = 0, |
254 | .chip_select = 2, | 263 | .chip_select = 2, |
255 | .platform_data = NULL, | 264 | .platform_data = NULL, |
256 | .controller_data = &ad5304_chip_info, | 265 | .controller_data = &ad5304_chip_info, |
@@ -259,17 +268,33 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
259 | #endif | 268 | #endif |
260 | }; | 269 | }; |
261 | 270 | ||
271 | /* SPI (0) */ | ||
272 | static struct resource bfin_spi0_resource[] = { | ||
273 | [0] = { | ||
274 | .start = SPI0_REGBASE, | ||
275 | .end = SPI0_REGBASE + 0xFF, | ||
276 | .flags = IORESOURCE_MEM, | ||
277 | }, | ||
278 | [1] = { | ||
279 | .start = CH_SPI, | ||
280 | .end = CH_SPI, | ||
281 | .flags = IORESOURCE_IRQ, | ||
282 | } | ||
283 | }; | ||
284 | |||
262 | /* SPI controller data */ | 285 | /* SPI controller data */ |
263 | static struct bfin5xx_spi_master spi_bfin_master_info = { | 286 | static struct bfin5xx_spi_master bfin_spi0_info = { |
264 | .num_chipselect = 8, | 287 | .num_chipselect = 8, |
265 | .enable_dma = 1, /* master has the ability to do dma transfer */ | 288 | .enable_dma = 1, /* master has the ability to do dma transfer */ |
266 | }; | 289 | }; |
267 | 290 | ||
268 | static struct platform_device spi_bfin_master_device = { | 291 | static struct platform_device bfin_spi0_device = { |
269 | .name = "bfin-spi-master", | 292 | .name = "bfin-spi", |
270 | .id = 1, /* Bus number */ | 293 | .id = 0, /* Bus number */ |
294 | .num_resources = ARRAY_SIZE(bfin_spi0_resource), | ||
295 | .resource = bfin_spi0_resource, | ||
271 | .dev = { | 296 | .dev = { |
272 | .platform_data = &spi_bfin_master_info, /* Passed to driver */ | 297 | .platform_data = &bfin_spi0_info, /* Passed to driver */ |
273 | }, | 298 | }, |
274 | }; | 299 | }; |
275 | #endif /* spi master and devices */ | 300 | #endif /* spi master and devices */ |
@@ -309,6 +334,43 @@ static struct platform_device bfin_sport1_uart_device = { | |||
309 | }; | 334 | }; |
310 | #endif | 335 | #endif |
311 | 336 | ||
337 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
338 | #define PATA_INT 55 | ||
339 | |||
340 | static struct pata_platform_info bfin_pata_platform_data = { | ||
341 | .ioport_shift = 1, | ||
342 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
343 | }; | ||
344 | |||
345 | static struct resource bfin_pata_resources[] = { | ||
346 | { | ||
347 | .start = 0x20314020, | ||
348 | .end = 0x2031403F, | ||
349 | .flags = IORESOURCE_MEM, | ||
350 | }, | ||
351 | { | ||
352 | .start = 0x2031401C, | ||
353 | .end = 0x2031401F, | ||
354 | .flags = IORESOURCE_MEM, | ||
355 | }, | ||
356 | { | ||
357 | .start = PATA_INT, | ||
358 | .end = PATA_INT, | ||
359 | .flags = IORESOURCE_IRQ, | ||
360 | }, | ||
361 | }; | ||
362 | |||
363 | static struct platform_device bfin_pata_device = { | ||
364 | .name = "pata_platform", | ||
365 | .id = -1, | ||
366 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
367 | .resource = bfin_pata_resources, | ||
368 | .dev = { | ||
369 | .platform_data = &bfin_pata_platform_data, | ||
370 | } | ||
371 | }; | ||
372 | #endif | ||
373 | |||
312 | static struct platform_device *stamp_devices[] __initdata = { | 374 | static struct platform_device *stamp_devices[] __initdata = { |
313 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | 375 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) |
314 | &rtc_device, | 376 | &rtc_device, |
@@ -318,12 +380,16 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
318 | &smc91x_device, | 380 | &smc91x_device, |
319 | #endif | 381 | #endif |
320 | 382 | ||
383 | #if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE) | ||
384 | &bfin_fb_adv7393_device, | ||
385 | #endif | ||
386 | |||
321 | #if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) | 387 | #if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) |
322 | &net2272_bfin_device, | 388 | &net2272_bfin_device, |
323 | #endif | 389 | #endif |
324 | 390 | ||
325 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 391 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
326 | &spi_bfin_master_device, | 392 | &bfin_spi0_device, |
327 | #endif | 393 | #endif |
328 | 394 | ||
329 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 395 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) |
@@ -334,6 +400,10 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
334 | &bfin_sport0_uart_device, | 400 | &bfin_sport0_uart_device, |
335 | &bfin_sport1_uart_device, | 401 | &bfin_sport1_uart_device, |
336 | #endif | 402 | #endif |
403 | |||
404 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
405 | &bfin_pata_device, | ||
406 | #endif | ||
337 | }; | 407 | }; |
338 | 408 | ||
339 | static int __init stamp_init(void) | 409 | static int __init stamp_init(void) |
@@ -355,8 +425,23 @@ static int __init stamp_init(void) | |||
355 | #endif | 425 | #endif |
356 | 426 | ||
357 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 427 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
358 | return spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 428 | spi_register_board_info(bfin_spi_board_info, |
429 | ARRAY_SIZE(bfin_spi_board_info)); | ||
430 | #endif | ||
431 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
432 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
359 | #endif | 433 | #endif |
434 | return 0; | ||
360 | } | 435 | } |
361 | 436 | ||
362 | arch_initcall(stamp_init); | 437 | arch_initcall(stamp_init); |
438 | |||
439 | void native_machine_restart(char *cmd) | ||
440 | { | ||
441 | #if defined(CONFIG_BFIN_SHARED_FLASH_ENET) | ||
442 | # define BIT_TO_SET (1 << CONFIG_ENET_FLASH_PIN) | ||
443 | bfin_write_FIO_INEN(~BIT_TO_SET); | ||
444 | bfin_write_FIO_DIR(BIT_TO_SET); | ||
445 | bfin_write_FIO_FLAG_C(BIT_TO_SET); | ||
446 | #endif | ||
447 | } | ||
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c index a8f947b72754..44dea05e1d03 100644 --- a/arch/blackfin/mach-bf537/boards/cm_bf537.c +++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c | |||
@@ -35,7 +35,9 @@ | |||
35 | #include <linux/spi/spi.h> | 35 | #include <linux/spi/spi.h> |
36 | #include <linux/spi/flash.h> | 36 | #include <linux/spi/flash.h> |
37 | #include <linux/usb_isp1362.h> | 37 | #include <linux/usb_isp1362.h> |
38 | #include <linux/pata_platform.h> | ||
38 | #include <linux/irq.h> | 39 | #include <linux/irq.h> |
40 | #include <asm/dma.h> | ||
39 | #include <asm/bfin5xx_spi.h> | 41 | #include <asm/bfin5xx_spi.h> |
40 | 42 | ||
41 | /* | 43 | /* |
@@ -113,7 +115,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
113 | /* the modalias must be the same as spi device driver name */ | 115 | /* the modalias must be the same as spi device driver name */ |
114 | .modalias = "m25p80", /* Name of spi_driver for this device */ | 116 | .modalias = "m25p80", /* Name of spi_driver for this device */ |
115 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 117 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ |
116 | .bus_num = 1, /* Framework bus number */ | 118 | .bus_num = 0, /* Framework bus number */ |
117 | .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/ | 119 | .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/ |
118 | .platform_data = &bfin_spi_flash_data, | 120 | .platform_data = &bfin_spi_flash_data, |
119 | .controller_data = &spi_flash_chip_info, | 121 | .controller_data = &spi_flash_chip_info, |
@@ -125,7 +127,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
125 | { | 127 | { |
126 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ | 128 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ |
127 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ | 129 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ |
128 | .bus_num = 1, /* Framework bus number */ | 130 | .bus_num = 0, /* Framework bus number */ |
129 | .chip_select = 1, /* Framework chip select. */ | 131 | .chip_select = 1, /* Framework chip select. */ |
130 | .platform_data = NULL, /* No spi_driver specific config */ | 132 | .platform_data = NULL, /* No spi_driver specific config */ |
131 | .controller_data = &spi_adc_chip_info, | 133 | .controller_data = &spi_adc_chip_info, |
@@ -136,7 +138,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
136 | { | 138 | { |
137 | .modalias = "ad1836-spi", | 139 | .modalias = "ad1836-spi", |
138 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 140 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
139 | .bus_num = 1, | 141 | .bus_num = 0, |
140 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 142 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
141 | .controller_data = &ad1836_spi_chip_info, | 143 | .controller_data = &ad1836_spi_chip_info, |
142 | }, | 144 | }, |
@@ -146,7 +148,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
146 | { | 148 | { |
147 | .modalias = "ad9960-spi", | 149 | .modalias = "ad9960-spi", |
148 | .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */ | 150 | .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */ |
149 | .bus_num = 1, | 151 | .bus_num = 0, |
150 | .chip_select = 1, | 152 | .chip_select = 1, |
151 | .controller_data = &ad9960_spi_chip_info, | 153 | .controller_data = &ad9960_spi_chip_info, |
152 | }, | 154 | }, |
@@ -156,7 +158,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
156 | { | 158 | { |
157 | .modalias = "spi_mmc_dummy", | 159 | .modalias = "spi_mmc_dummy", |
158 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 160 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ |
159 | .bus_num = 1, | 161 | .bus_num = 0, |
160 | .chip_select = 7, | 162 | .chip_select = 7, |
161 | .platform_data = NULL, | 163 | .platform_data = NULL, |
162 | .controller_data = &spi_mmc_chip_info, | 164 | .controller_data = &spi_mmc_chip_info, |
@@ -165,7 +167,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
165 | { | 167 | { |
166 | .modalias = "spi_mmc", | 168 | .modalias = "spi_mmc", |
167 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 169 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ |
168 | .bus_num = 1, | 170 | .bus_num = 0, |
169 | .chip_select = CONFIG_SPI_MMC_CS_CHAN, | 171 | .chip_select = CONFIG_SPI_MMC_CS_CHAN, |
170 | .platform_data = NULL, | 172 | .platform_data = NULL, |
171 | .controller_data = &spi_mmc_chip_info, | 173 | .controller_data = &spi_mmc_chip_info, |
@@ -174,17 +176,33 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
174 | #endif | 176 | #endif |
175 | }; | 177 | }; |
176 | 178 | ||
179 | /* SPI (0) */ | ||
180 | static struct resource bfin_spi0_resource[] = { | ||
181 | [0] = { | ||
182 | .start = SPI0_REGBASE, | ||
183 | .end = SPI0_REGBASE + 0xFF, | ||
184 | .flags = IORESOURCE_MEM, | ||
185 | }, | ||
186 | [1] = { | ||
187 | .start = CH_SPI, | ||
188 | .end = CH_SPI, | ||
189 | .flags = IORESOURCE_IRQ, | ||
190 | } | ||
191 | }; | ||
192 | |||
177 | /* SPI controller data */ | 193 | /* SPI controller data */ |
178 | static struct bfin5xx_spi_master spi_bfin_master_info = { | 194 | static struct bfin5xx_spi_master bfin_spi0_info = { |
179 | .num_chipselect = 8, | 195 | .num_chipselect = 8, |
180 | .enable_dma = 1, /* master has the ability to do dma transfer */ | 196 | .enable_dma = 1, /* master has the ability to do dma transfer */ |
181 | }; | 197 | }; |
182 | 198 | ||
183 | static struct platform_device spi_bfin_master_device = { | 199 | static struct platform_device bfin_spi0_device = { |
184 | .name = "bfin-spi-master", | 200 | .name = "bfin-spi", |
185 | .id = 1, /* Bus number */ | 201 | .id = 0, /* Bus number */ |
202 | .num_resources = ARRAY_SIZE(bfin_spi0_resource), | ||
203 | .resource = bfin_spi0_resource, | ||
186 | .dev = { | 204 | .dev = { |
187 | .platform_data = &spi_bfin_master_info, /* Passed to driver */ | 205 | .platform_data = &bfin_spi0_info, /* Passed to driver */ |
188 | }, | 206 | }, |
189 | }; | 207 | }; |
190 | #endif /* spi master and devices */ | 208 | #endif /* spi master and devices */ |
@@ -316,6 +334,43 @@ static struct platform_device bfin_mac_device = { | |||
316 | }; | 334 | }; |
317 | #endif | 335 | #endif |
318 | 336 | ||
337 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
338 | #define PATA_INT 64 | ||
339 | |||
340 | static struct pata_platform_info bfin_pata_platform_data = { | ||
341 | .ioport_shift = 2, | ||
342 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
343 | }; | ||
344 | |||
345 | static struct resource bfin_pata_resources[] = { | ||
346 | { | ||
347 | .start = 0x2030C000, | ||
348 | .end = 0x2030C01F, | ||
349 | .flags = IORESOURCE_MEM, | ||
350 | }, | ||
351 | { | ||
352 | .start = 0x2030D018, | ||
353 | .end = 0x2030D01B, | ||
354 | .flags = IORESOURCE_MEM, | ||
355 | }, | ||
356 | { | ||
357 | .start = PATA_INT, | ||
358 | .end = PATA_INT, | ||
359 | .flags = IORESOURCE_IRQ, | ||
360 | }, | ||
361 | }; | ||
362 | |||
363 | static struct platform_device bfin_pata_device = { | ||
364 | .name = "pata_platform", | ||
365 | .id = -1, | ||
366 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
367 | .resource = bfin_pata_resources, | ||
368 | .dev = { | ||
369 | .platform_data = &bfin_pata_platform_data, | ||
370 | } | ||
371 | }; | ||
372 | #endif | ||
373 | |||
319 | static struct platform_device *cm_bf537_devices[] __initdata = { | 374 | static struct platform_device *cm_bf537_devices[] __initdata = { |
320 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | 375 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) |
321 | &rtc_device, | 376 | &rtc_device, |
@@ -347,7 +402,11 @@ static struct platform_device *cm_bf537_devices[] __initdata = { | |||
347 | #endif | 402 | #endif |
348 | 403 | ||
349 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 404 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
350 | &spi_bfin_master_device, | 405 | &bfin_spi0_device, |
406 | #endif | ||
407 | |||
408 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
409 | &bfin_pata_device, | ||
351 | #endif | 410 | #endif |
352 | }; | 411 | }; |
353 | 412 | ||
@@ -358,6 +417,10 @@ static int __init cm_bf537_init(void) | |||
358 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 417 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
359 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 418 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
360 | #endif | 419 | #endif |
420 | |||
421 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
422 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
423 | #endif | ||
361 | return 0; | 424 | return 0; |
362 | } | 425 | } |
363 | 426 | ||
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c index 648d984e98d6..5e9d09eb8579 100644 --- a/arch/blackfin/mach-bf537/boards/generic_board.c +++ b/arch/blackfin/mach-bf537/boards/generic_board.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * | 8 | * |
9 | * Modified: | 9 | * Modified: |
10 | * Copyright 2005 National ICT Australia (NICTA) | 10 | * Copyright 2005 National ICT Australia (NICTA) |
11 | * Copyright 2004-2006 Analog Devices Inc. | 11 | * Copyright 2004-2007 Analog Devices Inc. |
12 | * | 12 | * |
13 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | 13 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ |
14 | * | 14 | * |
@@ -34,20 +34,74 @@ | |||
34 | #include <linux/mtd/partitions.h> | 34 | #include <linux/mtd/partitions.h> |
35 | #include <linux/spi/spi.h> | 35 | #include <linux/spi/spi.h> |
36 | #include <linux/spi/flash.h> | 36 | #include <linux/spi/flash.h> |
37 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | ||
37 | #include <linux/usb_isp1362.h> | 38 | #include <linux/usb_isp1362.h> |
39 | #endif | ||
40 | #include <linux/pata_platform.h> | ||
38 | #include <linux/irq.h> | 41 | #include <linux/irq.h> |
42 | #include <linux/interrupt.h> | ||
39 | #include <linux/usb_sl811.h> | 43 | #include <linux/usb_sl811.h> |
44 | #include <asm/dma.h> | ||
40 | #include <asm/bfin5xx_spi.h> | 45 | #include <asm/bfin5xx_spi.h> |
46 | #include <asm/reboot.h> | ||
47 | #include <linux/spi/ad7877.h> | ||
41 | 48 | ||
42 | /* | 49 | /* |
43 | * Name the Board for the /proc/cpuinfo | 50 | * Name the Board for the /proc/cpuinfo |
44 | */ | 51 | */ |
45 | char *bfin_board_name = "UNKNOWN BOARD"; | 52 | char *bfin_board_name = "GENERIC Board"; |
46 | 53 | ||
47 | /* | 54 | /* |
48 | * Driver needs to know address, irq and flag pin. | 55 | * Driver needs to know address, irq and flag pin. |
49 | */ | 56 | */ |
50 | 57 | ||
58 | #define ISP1761_BASE 0x203C0000 | ||
59 | #define ISP1761_IRQ IRQ_PF7 | ||
60 | |||
61 | #if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE) | ||
62 | static struct resource bfin_isp1761_resources[] = { | ||
63 | [0] = { | ||
64 | .name = "isp1761-regs", | ||
65 | .start = ISP1761_BASE + 0x00000000, | ||
66 | .end = ISP1761_BASE + 0x000fffff, | ||
67 | .flags = IORESOURCE_MEM, | ||
68 | }, | ||
69 | [1] = { | ||
70 | .start = ISP1761_IRQ, | ||
71 | .end = ISP1761_IRQ, | ||
72 | .flags = IORESOURCE_IRQ, | ||
73 | }, | ||
74 | }; | ||
75 | |||
76 | static struct platform_device bfin_isp1761_device = { | ||
77 | .name = "isp1761", | ||
78 | .id = 0, | ||
79 | .num_resources = ARRAY_SIZE(bfin_isp1761_resources), | ||
80 | .resource = bfin_isp1761_resources, | ||
81 | }; | ||
82 | |||
83 | static struct platform_device *bfin_isp1761_devices[] = { | ||
84 | &bfin_isp1761_device, | ||
85 | }; | ||
86 | |||
87 | int __init bfin_isp1761_init(void) | ||
88 | { | ||
89 | unsigned int num_devices = ARRAY_SIZE(bfin_isp1761_devices); | ||
90 | |||
91 | printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); | ||
92 | set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING); | ||
93 | |||
94 | return platform_add_devices(bfin_isp1761_devices, num_devices); | ||
95 | } | ||
96 | |||
97 | void __exit bfin_isp1761_exit(void) | ||
98 | { | ||
99 | platform_device_unregister(&bfin_isp1761_device); | ||
100 | } | ||
101 | |||
102 | arch_initcall(bfin_isp1761_init); | ||
103 | #endif | ||
104 | |||
51 | #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) | 105 | #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) |
52 | static struct resource bfin_pcmcia_cf_resources[] = { | 106 | static struct resource bfin_pcmcia_cf_resources[] = { |
53 | { | 107 | { |
@@ -59,10 +113,6 @@ static struct resource bfin_pcmcia_cf_resources[] = { | |||
59 | .end = 0x20311FFF, | 113 | .end = 0x20311FFF, |
60 | .flags = IORESOURCE_MEM, | 114 | .flags = IORESOURCE_MEM, |
61 | }, { | 115 | }, { |
62 | .start = IRQ_PROG_INTA, | ||
63 | .end = IRQ_PROG_INTA, | ||
64 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, | ||
65 | }, { | ||
66 | .start = IRQ_PF4, | 116 | .start = IRQ_PF4, |
67 | .end = IRQ_PF4, | 117 | .end = IRQ_PF4, |
68 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, | 118 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, |
@@ -96,14 +146,7 @@ static struct resource smc91x_resources[] = { | |||
96 | .end = 0x20300300 + 16, | 146 | .end = 0x20300300 + 16, |
97 | .flags = IORESOURCE_MEM, | 147 | .flags = IORESOURCE_MEM, |
98 | }, { | 148 | }, { |
99 | .start = IRQ_PROG_INTB, | 149 | |
100 | .end = IRQ_PROG_INTB, | ||
101 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | ||
102 | }, { | ||
103 | /* | ||
104 | * denotes the flag pin and is used directly if | ||
105 | * CONFIG_IRQCHIP_DEMUX_GPIO is defined. | ||
106 | */ | ||
107 | .start = IRQ_PF7, | 150 | .start = IRQ_PF7, |
108 | .end = IRQ_PF7, | 151 | .end = IRQ_PF7, |
109 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | 152 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
@@ -117,6 +160,28 @@ static struct platform_device smc91x_device = { | |||
117 | }; | 160 | }; |
118 | #endif | 161 | #endif |
119 | 162 | ||
163 | #if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE) | ||
164 | static struct resource dm9000_resources[] = { | ||
165 | [0] = { | ||
166 | .start = 0x203FB800, | ||
167 | .end = 0x203FB800 + 8, | ||
168 | .flags = IORESOURCE_MEM, | ||
169 | }, | ||
170 | [1] = { | ||
171 | .start = IRQ_PF9, | ||
172 | .end = IRQ_PF9, | ||
173 | .flags = (IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE), | ||
174 | }, | ||
175 | }; | ||
176 | |||
177 | static struct platform_device dm9000_device = { | ||
178 | .name = "dm9000", | ||
179 | .id = -1, | ||
180 | .num_resources = ARRAY_SIZE(dm9000_resources), | ||
181 | .resource = dm9000_resources, | ||
182 | }; | ||
183 | #endif | ||
184 | |||
120 | #if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE) | 185 | #if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE) |
121 | static struct resource sl811_hcd_resources[] = { | 186 | static struct resource sl811_hcd_resources[] = { |
122 | { | 187 | { |
@@ -128,12 +193,8 @@ static struct resource sl811_hcd_resources[] = { | |||
128 | .end = 0x20340004, | 193 | .end = 0x20340004, |
129 | .flags = IORESOURCE_MEM, | 194 | .flags = IORESOURCE_MEM, |
130 | }, { | 195 | }, { |
131 | .start = IRQ_PROG_INTA, | 196 | .start = CONFIG_USB_SL811_BFIN_IRQ, |
132 | .end = IRQ_PROG_INTA, | 197 | .end = CONFIG_USB_SL811_BFIN_IRQ, |
133 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | ||
134 | }, { | ||
135 | .start = IRQ_PF0 + CONFIG_USB_SL811_BFIN_GPIO, | ||
136 | .end = IRQ_PF0 + CONFIG_USB_SL811_BFIN_GPIO, | ||
137 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | 198 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
138 | }, | 199 | }, |
139 | }; | 200 | }; |
@@ -141,21 +202,19 @@ static struct resource sl811_hcd_resources[] = { | |||
141 | #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS) | 202 | #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS) |
142 | void sl811_port_power(struct device *dev, int is_on) | 203 | void sl811_port_power(struct device *dev, int is_on) |
143 | { | 204 | { |
144 | unsigned short mask = (1<<CONFIG_USB_SL811_BFIN_GPIO_VBUS); | 205 | gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS"); |
145 | 206 | gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS); | |
146 | bfin_write_PORT_FER(bfin_read_PORT_FER() & ~mask); | ||
147 | bfin_write_FIO_DIR(bfin_read_FIO_DIR() | mask); | ||
148 | 207 | ||
149 | if (is_on) | 208 | if (is_on) |
150 | bfin_write_FIO_FLAG_S(mask); | 209 | gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 1); |
151 | else | 210 | else |
152 | bfin_write_FIO_FLAG_C(mask); | 211 | gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 0); |
153 | } | 212 | } |
154 | #endif | 213 | #endif |
155 | 214 | ||
156 | static struct sl811_platform_data sl811_priv = { | 215 | static struct sl811_platform_data sl811_priv = { |
157 | .potpg = 10, | 216 | .potpg = 10, |
158 | .power = 250, /* == 500mA */ | 217 | .power = 250, /* == 500mA */ |
159 | #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS) | 218 | #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS) |
160 | .port_power = &sl811_port_power, | 219 | .port_power = &sl811_port_power, |
161 | #endif | 220 | #endif |
@@ -170,7 +229,6 @@ static struct platform_device sl811_hcd_device = { | |||
170 | .num_resources = ARRAY_SIZE(sl811_hcd_resources), | 229 | .num_resources = ARRAY_SIZE(sl811_hcd_resources), |
171 | .resource = sl811_hcd_resources, | 230 | .resource = sl811_hcd_resources, |
172 | }; | 231 | }; |
173 | |||
174 | #endif | 232 | #endif |
175 | 233 | ||
176 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 234 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
@@ -184,13 +242,9 @@ static struct resource isp1362_hcd_resources[] = { | |||
184 | .end = 0x20360004, | 242 | .end = 0x20360004, |
185 | .flags = IORESOURCE_MEM, | 243 | .flags = IORESOURCE_MEM, |
186 | }, { | 244 | }, { |
187 | .start = IRQ_PROG_INTA, | 245 | .start = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ, |
188 | .end = IRQ_PROG_INTA, | 246 | .end = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ, |
189 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | 247 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
190 | }, { | ||
191 | .start = IRQ_PF0 + CONFIG_USB_ISP1362_BFIN_GPIO, | ||
192 | .end = IRQ_PF0 + CONFIG_USB_ISP1362_BFIN_GPIO, | ||
193 | .flags = IORESOURCE_IRQ, | ||
194 | }, | 248 | }, |
195 | }; | 249 | }; |
196 | 250 | ||
@@ -246,7 +300,8 @@ static struct platform_device net2272_bfin_device = { | |||
246 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 300 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
247 | /* all SPI peripherals info goes here */ | 301 | /* all SPI peripherals info goes here */ |
248 | 302 | ||
249 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 303 | #if defined(CONFIG_MTD_M25P80) \ |
304 | || defined(CONFIG_MTD_M25P80_MODULE) | ||
250 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 305 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
251 | { | 306 | { |
252 | .name = "bootloader", | 307 | .name = "bootloader", |
@@ -302,70 +357,198 @@ static struct bfin5xx_spi_chip ad9960_spi_chip_info = { | |||
302 | }; | 357 | }; |
303 | #endif | 358 | #endif |
304 | 359 | ||
360 | #if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE) | ||
361 | static struct bfin5xx_spi_chip spi_mmc_chip_info = { | ||
362 | .enable_dma = 1, | ||
363 | .bits_per_word = 8, | ||
364 | }; | ||
365 | #endif | ||
366 | |||
367 | #if defined(CONFIG_PBX) | ||
368 | static struct bfin5xx_spi_chip spi_si3xxx_chip_info = { | ||
369 | .ctl_reg = 0x4, /* send zero */ | ||
370 | .enable_dma = 0, | ||
371 | .bits_per_word = 8, | ||
372 | .cs_change_per_word = 1, | ||
373 | }; | ||
374 | #endif | ||
375 | |||
376 | #if defined(CONFIG_AD5304) || defined(CONFIG_AD5304_MODULE) | ||
377 | static struct bfin5xx_spi_chip ad5304_chip_info = { | ||
378 | .enable_dma = 0, | ||
379 | .bits_per_word = 16, | ||
380 | }; | ||
381 | #endif | ||
382 | |||
383 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) | ||
384 | static struct bfin5xx_spi_chip spi_ad7877_chip_info = { | ||
385 | .enable_dma = 0, | ||
386 | .bits_per_word = 16, | ||
387 | }; | ||
388 | |||
389 | static const struct ad7877_platform_data bfin_ad7877_ts_info = { | ||
390 | .model = 7877, | ||
391 | .vref_delay_usecs = 50, /* internal, no capacitor */ | ||
392 | .x_plate_ohms = 419, | ||
393 | .y_plate_ohms = 486, | ||
394 | .pressure_max = 1000, | ||
395 | .pressure_min = 0, | ||
396 | .stopacq_polarity = 1, | ||
397 | .first_conversion_delay = 3, | ||
398 | .acquisition_time = 1, | ||
399 | .averaging = 1, | ||
400 | .pen_down_acc_interval = 1, | ||
401 | }; | ||
402 | #endif | ||
403 | |||
305 | static struct spi_board_info bfin_spi_board_info[] __initdata = { | 404 | static struct spi_board_info bfin_spi_board_info[] __initdata = { |
306 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 405 | #if defined(CONFIG_MTD_M25P80) \ |
406 | || defined(CONFIG_MTD_M25P80_MODULE) | ||
307 | { | 407 | { |
308 | /* the modalias must be the same as spi device driver name */ | 408 | /* the modalias must be the same as spi device driver name */ |
309 | .modalias = "m25p80", /* Name of spi_driver for this device */ | 409 | .modalias = "m25p80", /* Name of spi_driver for this device */ |
310 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 410 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ |
311 | .bus_num = 1, /* Framework bus number */ | 411 | .bus_num = 0, /* Framework bus number */ |
312 | .chip_select = 2, /* Framework chip select. On STAMP537 it is SPISSEL1*/ | 412 | .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/ |
313 | .platform_data = &bfin_spi_flash_data, | 413 | .platform_data = &bfin_spi_flash_data, |
314 | .controller_data = &spi_flash_chip_info, | 414 | .controller_data = &spi_flash_chip_info, |
315 | .mode = SPI_MODE_3, | 415 | .mode = SPI_MODE_3, |
316 | }, | 416 | }, |
317 | #endif | 417 | #endif |
318 | 418 | ||
319 | #if defined(CONFIG_SPI_ADC_BF533) || defined(CONFIG_SPI_ADC_BF533_MODULE) | 419 | #if defined(CONFIG_SPI_ADC_BF533) \ |
420 | || defined(CONFIG_SPI_ADC_BF533_MODULE) | ||
320 | { | 421 | { |
321 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ | 422 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ |
322 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ | 423 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ |
323 | .bus_num = 1, /* Framework bus number */ | 424 | .bus_num = 0, /* Framework bus number */ |
324 | .chip_select = 1, /* Framework chip select. */ | 425 | .chip_select = 1, /* Framework chip select. */ |
325 | .platform_data = NULL, /* No spi_driver specific config */ | 426 | .platform_data = NULL, /* No spi_driver specific config */ |
326 | .controller_data = &spi_adc_chip_info, | 427 | .controller_data = &spi_adc_chip_info, |
327 | }, | 428 | }, |
328 | #endif | 429 | #endif |
329 | 430 | ||
330 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 431 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ |
432 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | ||
331 | { | 433 | { |
332 | .modalias = "ad1836-spi", | 434 | .modalias = "ad1836-spi", |
333 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 435 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
334 | .bus_num = 1, | 436 | .bus_num = 0, |
335 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 437 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
336 | .controller_data = &ad1836_spi_chip_info, | 438 | .controller_data = &ad1836_spi_chip_info, |
337 | }, | 439 | }, |
338 | #endif | 440 | #endif |
339 | |||
340 | #if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE) | 441 | #if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE) |
341 | { | 442 | { |
342 | .modalias = "ad9960-spi", | 443 | .modalias = "ad9960-spi", |
343 | .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */ | 444 | .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */ |
344 | .bus_num = 1, | 445 | .bus_num = 0, |
345 | .chip_select = 1, | 446 | .chip_select = 1, |
346 | .controller_data = &ad9960_spi_chip_info, | 447 | .controller_data = &ad9960_spi_chip_info, |
347 | }, | 448 | }, |
348 | #endif | 449 | #endif |
450 | #if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE) | ||
451 | { | ||
452 | .modalias = "spi_mmc_dummy", | ||
453 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | ||
454 | .bus_num = 0, | ||
455 | .chip_select = 0, | ||
456 | .platform_data = NULL, | ||
457 | .controller_data = &spi_mmc_chip_info, | ||
458 | .mode = SPI_MODE_3, | ||
459 | }, | ||
460 | { | ||
461 | .modalias = "spi_mmc", | ||
462 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | ||
463 | .bus_num = 0, | ||
464 | .chip_select = CONFIG_SPI_MMC_CS_CHAN, | ||
465 | .platform_data = NULL, | ||
466 | .controller_data = &spi_mmc_chip_info, | ||
467 | .mode = SPI_MODE_3, | ||
468 | }, | ||
469 | #endif | ||
470 | #if defined(CONFIG_PBX) | ||
471 | { | ||
472 | .modalias = "fxs-spi", | ||
473 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | ||
474 | .bus_num = 0, | ||
475 | .chip_select = 8 - CONFIG_J11_JUMPER, | ||
476 | .controller_data = &spi_si3xxx_chip_info, | ||
477 | .mode = SPI_MODE_3, | ||
478 | }, | ||
479 | { | ||
480 | .modalias = "fxo-spi", | ||
481 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | ||
482 | .bus_num = 0, | ||
483 | .chip_select = 8 - CONFIG_J19_JUMPER, | ||
484 | .controller_data = &spi_si3xxx_chip_info, | ||
485 | .mode = SPI_MODE_3, | ||
486 | }, | ||
487 | #endif | ||
488 | #if defined(CONFIG_AD5304) || defined(CONFIG_AD5304_MODULE) | ||
489 | { | ||
490 | .modalias = "ad5304_spi", | ||
491 | .max_speed_hz = 1250000, /* max spi clock (SCK) speed in HZ */ | ||
492 | .bus_num = 0, | ||
493 | .chip_select = 2, | ||
494 | .platform_data = NULL, | ||
495 | .controller_data = &ad5304_chip_info, | ||
496 | .mode = SPI_MODE_2, | ||
497 | }, | ||
498 | #endif | ||
499 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) | ||
500 | { | ||
501 | .modalias = "ad7877", | ||
502 | .platform_data = &bfin_ad7877_ts_info, | ||
503 | .irq = IRQ_PF6, | ||
504 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | ||
505 | .bus_num = 1, | ||
506 | .chip_select = 1, | ||
507 | .controller_data = &spi_ad7877_chip_info, | ||
508 | }, | ||
509 | #endif | ||
349 | }; | 510 | }; |
350 | 511 | ||
351 | /* SPI controller data */ | 512 | /* SPI controller data */ |
352 | static struct bfin5xx_spi_master spi_bfin_master_info = { | 513 | static struct bfin5xx_spi_master bfin_spi0_info = { |
353 | .num_chipselect = 8, | 514 | .num_chipselect = 8, |
354 | .enable_dma = 1, /* master has the ability to do dma transfer */ | 515 | .enable_dma = 1, /* master has the ability to do dma transfer */ |
355 | }; | 516 | }; |
356 | 517 | ||
357 | static struct platform_device spi_bfin_master_device = { | 518 | /* SPI (0) */ |
358 | .name = "bfin-spi-master", | 519 | static struct resource bfin_spi0_resource[] = { |
359 | .id = 1, /* Bus number */ | 520 | [0] = { |
521 | .start = SPI0_REGBASE, | ||
522 | .end = SPI0_REGBASE + 0xFF, | ||
523 | .flags = IORESOURCE_MEM, | ||
524 | }, | ||
525 | [1] = { | ||
526 | .start = CH_SPI, | ||
527 | .end = CH_SPI, | ||
528 | .flags = IORESOURCE_IRQ, | ||
529 | }, | ||
530 | }; | ||
531 | |||
532 | static struct platform_device bfin_spi0_device = { | ||
533 | .name = "bfin-spi", | ||
534 | .id = 0, /* Bus number */ | ||
535 | .num_resources = ARRAY_SIZE(bfin_spi0_resource), | ||
536 | .resource = bfin_spi0_resource, | ||
360 | .dev = { | 537 | .dev = { |
361 | .platform_data = &spi_bfin_master_info, /* Passed to driver */ | 538 | .platform_data = &bfin_spi0_info, /* Passed to driver */ |
362 | }, | 539 | }, |
363 | }; | 540 | }; |
364 | #endif /* spi master and devices */ | 541 | #endif /* spi master and devices */ |
365 | 542 | ||
366 | #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE) | 543 | #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE) |
367 | static struct platform_device bfin_fb_device = { | 544 | static struct platform_device bfin_fb_device = { |
368 | .name = "bf537-fb", | 545 | .name = "bf537-lq035", |
546 | }; | ||
547 | #endif | ||
548 | |||
549 | #if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE) | ||
550 | static struct platform_device bfin_fb_adv7393_device = { | ||
551 | .name = "bfin-adv7393", | ||
369 | }; | 552 | }; |
370 | #endif | 553 | #endif |
371 | 554 | ||
@@ -390,15 +573,86 @@ static struct platform_device bfin_uart_device = { | |||
390 | }; | 573 | }; |
391 | #endif | 574 | #endif |
392 | 575 | ||
393 | static struct platform_device *stamp_devices[] __initdata = { | 576 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) |
394 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | 577 | static struct resource bfin_twi0_resource[] = { |
395 | &rtc_device, | 578 | [0] = { |
579 | .start = TWI0_REGBASE, | ||
580 | .end = TWI0_REGBASE + 0xFF, | ||
581 | .flags = IORESOURCE_MEM, | ||
582 | }, | ||
583 | [1] = { | ||
584 | .start = IRQ_TWI, | ||
585 | .end = IRQ_TWI, | ||
586 | .flags = IORESOURCE_IRQ, | ||
587 | }, | ||
588 | }; | ||
589 | |||
590 | static struct platform_device i2c_bfin_twi_device = { | ||
591 | .name = "i2c-bfin-twi", | ||
592 | .id = 0, | ||
593 | .num_resources = ARRAY_SIZE(bfin_twi0_resource), | ||
594 | .resource = bfin_twi0_resource, | ||
595 | }; | ||
596 | #endif | ||
597 | |||
598 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) | ||
599 | static struct platform_device bfin_sport0_uart_device = { | ||
600 | .name = "bfin-sport-uart", | ||
601 | .id = 0, | ||
602 | }; | ||
603 | |||
604 | static struct platform_device bfin_sport1_uart_device = { | ||
605 | .name = "bfin-sport-uart", | ||
606 | .id = 1, | ||
607 | }; | ||
608 | #endif | ||
609 | |||
610 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
611 | #define PATA_INT 55 | ||
612 | |||
613 | static struct pata_platform_info bfin_pata_platform_data = { | ||
614 | .ioport_shift = 1, | ||
615 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
616 | }; | ||
617 | |||
618 | static struct resource bfin_pata_resources[] = { | ||
619 | { | ||
620 | .start = 0x20314020, | ||
621 | .end = 0x2031403F, | ||
622 | .flags = IORESOURCE_MEM, | ||
623 | }, | ||
624 | { | ||
625 | .start = 0x2031401C, | ||
626 | .end = 0x2031401F, | ||
627 | .flags = IORESOURCE_MEM, | ||
628 | }, | ||
629 | { | ||
630 | .start = PATA_INT, | ||
631 | .end = PATA_INT, | ||
632 | .flags = IORESOURCE_IRQ, | ||
633 | }, | ||
634 | }; | ||
635 | |||
636 | static struct platform_device bfin_pata_device = { | ||
637 | .name = "pata_platform", | ||
638 | .id = -1, | ||
639 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
640 | .resource = bfin_pata_resources, | ||
641 | .dev = { | ||
642 | .platform_data = &bfin_pata_platform_data, | ||
643 | } | ||
644 | }; | ||
396 | #endif | 645 | #endif |
397 | 646 | ||
647 | static struct platform_device *stamp_devices[] __initdata = { | ||
398 | #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) | 648 | #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) |
399 | &bfin_pcmcia_cf_device, | 649 | &bfin_pcmcia_cf_device, |
400 | #endif | 650 | #endif |
401 | 651 | ||
652 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | ||
653 | &rtc_device, | ||
654 | #endif | ||
655 | |||
402 | #if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE) | 656 | #if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE) |
403 | &sl811_hcd_device, | 657 | &sl811_hcd_device, |
404 | #endif | 658 | #endif |
@@ -411,6 +665,10 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
411 | &smc91x_device, | 665 | &smc91x_device, |
412 | #endif | 666 | #endif |
413 | 667 | ||
668 | #if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE) | ||
669 | &dm9000_device, | ||
670 | #endif | ||
671 | |||
414 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 672 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
415 | &bfin_mac_device, | 673 | &bfin_mac_device, |
416 | #endif | 674 | #endif |
@@ -420,16 +678,33 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
420 | #endif | 678 | #endif |
421 | 679 | ||
422 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 680 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
423 | &spi_bfin_master_device, | 681 | &bfin_spi0_device, |
424 | #endif | 682 | #endif |
425 | 683 | ||
426 | #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE) | 684 | #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE) |
427 | &bfin_fb_device, | 685 | &bfin_fb_device, |
428 | #endif | 686 | #endif |
429 | 687 | ||
688 | #if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE) | ||
689 | &bfin_fb_adv7393_device, | ||
690 | #endif | ||
691 | |||
430 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 692 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) |
431 | &bfin_uart_device, | 693 | &bfin_uart_device, |
432 | #endif | 694 | #endif |
695 | |||
696 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | ||
697 | &i2c_bfin_twi_device, | ||
698 | #endif | ||
699 | |||
700 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) | ||
701 | &bfin_sport0_uart_device, | ||
702 | &bfin_sport1_uart_device, | ||
703 | #endif | ||
704 | |||
705 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
706 | &bfin_pata_device, | ||
707 | #endif | ||
433 | }; | 708 | }; |
434 | 709 | ||
435 | static int __init stamp_init(void) | 710 | static int __init stamp_init(void) |
@@ -437,9 +712,21 @@ static int __init stamp_init(void) | |||
437 | printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); | 712 | printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); |
438 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 713 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
439 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 714 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
440 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 715 | spi_register_board_info(bfin_spi_board_info, |
716 | ARRAY_SIZE(bfin_spi_board_info)); | ||
717 | #endif | ||
718 | |||
719 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
720 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
441 | #endif | 721 | #endif |
442 | return 0; | 722 | return 0; |
443 | } | 723 | } |
444 | 724 | ||
445 | arch_initcall(stamp_init); | 725 | arch_initcall(stamp_init); |
726 | |||
727 | void native_machine_restart(char *cmd) | ||
728 | { | ||
729 | /* workaround reboot hang when booting from SPI */ | ||
730 | if ((bfin_read_SYSCR() & 0x7) == 0x3) | ||
731 | bfin_gpio_reset_spi0_ssel1(); | ||
732 | } | ||
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c index 8806f1230f2d..20507e92a3a4 100644 --- a/arch/blackfin/mach-bf537/boards/pnav10.c +++ b/arch/blackfin/mach-bf537/boards/pnav10.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <linux/usb_isp1362.h> | 38 | #include <linux/usb_isp1362.h> |
39 | #endif | 39 | #endif |
40 | #include <linux/irq.h> | 40 | #include <linux/irq.h> |
41 | #include <asm/dma.h> | ||
41 | #include <asm/bfin5xx_spi.h> | 42 | #include <asm/bfin5xx_spi.h> |
42 | #include <linux/usb_sl811.h> | 43 | #include <linux/usb_sl811.h> |
43 | 44 | ||
@@ -130,15 +131,13 @@ static struct resource sl811_hcd_resources[] = { | |||
130 | #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS) | 131 | #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS) |
131 | void sl811_port_power(struct device *dev, int is_on) | 132 | void sl811_port_power(struct device *dev, int is_on) |
132 | { | 133 | { |
133 | unsigned short mask = (1 << CONFIG_USB_SL811_BFIN_GPIO_VBUS); | 134 | gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS"); |
134 | 135 | gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS); | |
135 | bfin_write_PORT_FER(bfin_read_PORT_FER() & ~mask); | ||
136 | bfin_write_FIO_DIR(bfin_read_FIO_DIR() | mask); | ||
137 | 136 | ||
138 | if (is_on) | 137 | if (is_on) |
139 | bfin_write_FIO_FLAG_S(mask); | 138 | gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 1); |
140 | else | 139 | else |
141 | bfin_write_FIO_FLAG_C(mask); | 140 | gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 0); |
142 | } | 141 | } |
143 | #endif | 142 | #endif |
144 | 143 | ||
@@ -323,7 +322,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
323 | /* the modalias must be the same as spi device driver name */ | 322 | /* the modalias must be the same as spi device driver name */ |
324 | .modalias = "m25p80", /* Name of spi_driver for this device */ | 323 | .modalias = "m25p80", /* Name of spi_driver for this device */ |
325 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 324 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ |
326 | .bus_num = 1, /* Framework bus number */ | 325 | .bus_num = 0, /* Framework bus number */ |
327 | .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/ | 326 | .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/ |
328 | .platform_data = &bfin_spi_flash_data, | 327 | .platform_data = &bfin_spi_flash_data, |
329 | .controller_data = &spi_flash_chip_info, | 328 | .controller_data = &spi_flash_chip_info, |
@@ -336,7 +335,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
336 | { | 335 | { |
337 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ | 336 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ |
338 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ | 337 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ |
339 | .bus_num = 1, /* Framework bus number */ | 338 | .bus_num = 0, /* Framework bus number */ |
340 | .chip_select = 1, /* Framework chip select. */ | 339 | .chip_select = 1, /* Framework chip select. */ |
341 | .platform_data = NULL, /* No spi_driver specific config */ | 340 | .platform_data = NULL, /* No spi_driver specific config */ |
342 | .controller_data = &spi_adc_chip_info, | 341 | .controller_data = &spi_adc_chip_info, |
@@ -348,7 +347,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
348 | { | 347 | { |
349 | .modalias = "ad1836-spi", | 348 | .modalias = "ad1836-spi", |
350 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 349 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
351 | .bus_num = 1, | 350 | .bus_num = 0, |
352 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 351 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
353 | .controller_data = &ad1836_spi_chip_info, | 352 | .controller_data = &ad1836_spi_chip_info, |
354 | }, | 353 | }, |
@@ -357,7 +356,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
357 | { | 356 | { |
358 | .modalias = "ad9960-spi", | 357 | .modalias = "ad9960-spi", |
359 | .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */ | 358 | .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */ |
360 | .bus_num = 1, | 359 | .bus_num = 0, |
361 | .chip_select = 1, | 360 | .chip_select = 1, |
362 | .controller_data = &ad9960_spi_chip_info, | 361 | .controller_data = &ad9960_spi_chip_info, |
363 | }, | 362 | }, |
@@ -366,7 +365,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
366 | { | 365 | { |
367 | .modalias = "spi_mmc_dummy", | 366 | .modalias = "spi_mmc_dummy", |
368 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 367 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ |
369 | .bus_num = 1, | 368 | .bus_num = 0, |
370 | .chip_select = 7, | 369 | .chip_select = 7, |
371 | .platform_data = NULL, | 370 | .platform_data = NULL, |
372 | .controller_data = &spi_mmc_chip_info, | 371 | .controller_data = &spi_mmc_chip_info, |
@@ -375,7 +374,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
375 | { | 374 | { |
376 | .modalias = "spi_mmc", | 375 | .modalias = "spi_mmc", |
377 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 376 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ |
378 | .bus_num = 1, | 377 | .bus_num = 0, |
379 | .chip_select = CONFIG_SPI_MMC_CS_CHAN, | 378 | .chip_select = CONFIG_SPI_MMC_CS_CHAN, |
380 | .platform_data = NULL, | 379 | .platform_data = NULL, |
381 | .controller_data = &spi_mmc_chip_info, | 380 | .controller_data = &spi_mmc_chip_info, |
@@ -396,24 +395,40 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
396 | 395 | ||
397 | }; | 396 | }; |
398 | 397 | ||
398 | /* SPI (0) */ | ||
399 | static struct resource bfin_spi0_resource[] = { | ||
400 | [0] = { | ||
401 | .start = SPI0_REGBASE, | ||
402 | .end = SPI0_REGBASE + 0xFF, | ||
403 | .flags = IORESOURCE_MEM, | ||
404 | }, | ||
405 | [1] = { | ||
406 | .start = CH_SPI, | ||
407 | .end = CH_SPI, | ||
408 | .flags = IORESOURCE_IRQ, | ||
409 | } | ||
410 | }; | ||
411 | |||
399 | /* SPI controller data */ | 412 | /* SPI controller data */ |
400 | static struct bfin5xx_spi_master spi_bfin_master_info = { | 413 | static struct bfin5xx_spi_master bfin_spi0_info = { |
401 | .num_chipselect = 8, | 414 | .num_chipselect = 8, |
402 | .enable_dma = 1, /* master has the ability to do dma transfer */ | 415 | .enable_dma = 1, /* master has the ability to do dma transfer */ |
403 | }; | 416 | }; |
404 | 417 | ||
405 | static struct platform_device spi_bfin_master_device = { | 418 | static struct platform_device bfin_spi0_device = { |
406 | .name = "bfin-spi-master", | 419 | .name = "bfin-spi", |
407 | .id = 1, /* Bus number */ | 420 | .id = 0, /* Bus number */ |
421 | .num_resources = ARRAY_SIZE(bfin_spi0_resource), | ||
422 | .resource = bfin_spi0_resource, | ||
408 | .dev = { | 423 | .dev = { |
409 | .platform_data = &spi_bfin_master_info, /* Passed to driver */ | 424 | .platform_data = &bfin_spi0_info, /* Passed to driver */ |
410 | }, | 425 | }, |
411 | }; | 426 | }; |
412 | #endif /* spi master and devices */ | 427 | #endif /* spi master and devices */ |
413 | 428 | ||
414 | #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE) | 429 | #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE) |
415 | static struct platform_device bfin_fb_device = { | 430 | static struct platform_device bfin_fb_device = { |
416 | .name = "bf537-fb", | 431 | .name = "bf537-lq035", |
417 | }; | 432 | }; |
418 | #endif | 433 | #endif |
419 | 434 | ||
@@ -469,7 +484,7 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
469 | #endif | 484 | #endif |
470 | 485 | ||
471 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 486 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
472 | &spi_bfin_master_device, | 487 | &bfin_spi0_device, |
473 | #endif | 488 | #endif |
474 | 489 | ||
475 | #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE) | 490 | #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE) |
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 9c43d7756510..47d7d4a0e73d 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -37,10 +37,13 @@ | |||
37 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 37 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
38 | #include <linux/usb_isp1362.h> | 38 | #include <linux/usb_isp1362.h> |
39 | #endif | 39 | #endif |
40 | #include <linux/pata_platform.h> | ||
40 | #include <linux/irq.h> | 41 | #include <linux/irq.h> |
41 | #include <linux/interrupt.h> | 42 | #include <linux/interrupt.h> |
42 | #include <linux/usb_sl811.h> | 43 | #include <linux/usb_sl811.h> |
44 | #include <asm/dma.h> | ||
43 | #include <asm/bfin5xx_spi.h> | 45 | #include <asm/bfin5xx_spi.h> |
46 | #include <asm/reboot.h> | ||
44 | #include <linux/spi/ad7877.h> | 47 | #include <linux/spi/ad7877.h> |
45 | 48 | ||
46 | /* | 49 | /* |
@@ -199,15 +202,13 @@ static struct resource sl811_hcd_resources[] = { | |||
199 | #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS) | 202 | #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS) |
200 | void sl811_port_power(struct device *dev, int is_on) | 203 | void sl811_port_power(struct device *dev, int is_on) |
201 | { | 204 | { |
202 | unsigned short mask = (1 << CONFIG_USB_SL811_BFIN_GPIO_VBUS); | 205 | gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS"); |
203 | 206 | gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS); | |
204 | bfin_write_PORT_FER(bfin_read_PORT_FER() & ~mask); | ||
205 | bfin_write_FIO_DIR(bfin_read_FIO_DIR() | mask); | ||
206 | 207 | ||
207 | if (is_on) | 208 | if (is_on) |
208 | bfin_write_FIO_FLAG_S(mask); | 209 | gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 1); |
209 | else | 210 | else |
210 | bfin_write_FIO_FLAG_C(mask); | 211 | gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 0); |
211 | } | 212 | } |
212 | #endif | 213 | #endif |
213 | 214 | ||
@@ -407,7 +408,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
407 | /* the modalias must be the same as spi device driver name */ | 408 | /* the modalias must be the same as spi device driver name */ |
408 | .modalias = "m25p80", /* Name of spi_driver for this device */ | 409 | .modalias = "m25p80", /* Name of spi_driver for this device */ |
409 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 410 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ |
410 | .bus_num = 1, /* Framework bus number */ | 411 | .bus_num = 0, /* Framework bus number */ |
411 | .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/ | 412 | .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/ |
412 | .platform_data = &bfin_spi_flash_data, | 413 | .platform_data = &bfin_spi_flash_data, |
413 | .controller_data = &spi_flash_chip_info, | 414 | .controller_data = &spi_flash_chip_info, |
@@ -420,7 +421,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
420 | { | 421 | { |
421 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ | 422 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ |
422 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ | 423 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ |
423 | .bus_num = 1, /* Framework bus number */ | 424 | .bus_num = 0, /* Framework bus number */ |
424 | .chip_select = 1, /* Framework chip select. */ | 425 | .chip_select = 1, /* Framework chip select. */ |
425 | .platform_data = NULL, /* No spi_driver specific config */ | 426 | .platform_data = NULL, /* No spi_driver specific config */ |
426 | .controller_data = &spi_adc_chip_info, | 427 | .controller_data = &spi_adc_chip_info, |
@@ -432,7 +433,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
432 | { | 433 | { |
433 | .modalias = "ad1836-spi", | 434 | .modalias = "ad1836-spi", |
434 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 435 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
435 | .bus_num = 1, | 436 | .bus_num = 0, |
436 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 437 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
437 | .controller_data = &ad1836_spi_chip_info, | 438 | .controller_data = &ad1836_spi_chip_info, |
438 | }, | 439 | }, |
@@ -441,7 +442,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
441 | { | 442 | { |
442 | .modalias = "ad9960-spi", | 443 | .modalias = "ad9960-spi", |
443 | .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */ | 444 | .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */ |
444 | .bus_num = 1, | 445 | .bus_num = 0, |
445 | .chip_select = 1, | 446 | .chip_select = 1, |
446 | .controller_data = &ad9960_spi_chip_info, | 447 | .controller_data = &ad9960_spi_chip_info, |
447 | }, | 448 | }, |
@@ -450,7 +451,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
450 | { | 451 | { |
451 | .modalias = "spi_mmc_dummy", | 452 | .modalias = "spi_mmc_dummy", |
452 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 453 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ |
453 | .bus_num = 1, | 454 | .bus_num = 0, |
454 | .chip_select = 0, | 455 | .chip_select = 0, |
455 | .platform_data = NULL, | 456 | .platform_data = NULL, |
456 | .controller_data = &spi_mmc_chip_info, | 457 | .controller_data = &spi_mmc_chip_info, |
@@ -459,7 +460,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
459 | { | 460 | { |
460 | .modalias = "spi_mmc", | 461 | .modalias = "spi_mmc", |
461 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 462 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ |
462 | .bus_num = 1, | 463 | .bus_num = 0, |
463 | .chip_select = CONFIG_SPI_MMC_CS_CHAN, | 464 | .chip_select = CONFIG_SPI_MMC_CS_CHAN, |
464 | .platform_data = NULL, | 465 | .platform_data = NULL, |
465 | .controller_data = &spi_mmc_chip_info, | 466 | .controller_data = &spi_mmc_chip_info, |
@@ -470,16 +471,16 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
470 | { | 471 | { |
471 | .modalias = "fxs-spi", | 472 | .modalias = "fxs-spi", |
472 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | 473 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ |
473 | .bus_num = 1, | 474 | .bus_num = 0, |
474 | .chip_select = 3, | 475 | .chip_select = 8 - CONFIG_J11_JUMPER, |
475 | .controller_data = &spi_si3xxx_chip_info, | 476 | .controller_data = &spi_si3xxx_chip_info, |
476 | .mode = SPI_MODE_3, | 477 | .mode = SPI_MODE_3, |
477 | }, | 478 | }, |
478 | { | 479 | { |
479 | .modalias = "fxo-spi", | 480 | .modalias = "fxo-spi", |
480 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | 481 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ |
481 | .bus_num = 1, | 482 | .bus_num = 0, |
482 | .chip_select = 2, | 483 | .chip_select = 8 - CONFIG_J19_JUMPER, |
483 | .controller_data = &spi_si3xxx_chip_info, | 484 | .controller_data = &spi_si3xxx_chip_info, |
484 | .mode = SPI_MODE_3, | 485 | .mode = SPI_MODE_3, |
485 | }, | 486 | }, |
@@ -488,7 +489,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
488 | { | 489 | { |
489 | .modalias = "ad5304_spi", | 490 | .modalias = "ad5304_spi", |
490 | .max_speed_hz = 1250000, /* max spi clock (SCK) speed in HZ */ | 491 | .max_speed_hz = 1250000, /* max spi clock (SCK) speed in HZ */ |
491 | .bus_num = 1, | 492 | .bus_num = 0, |
492 | .chip_select = 2, | 493 | .chip_select = 2, |
493 | .platform_data = NULL, | 494 | .platform_data = NULL, |
494 | .controller_data = &ad5304_chip_info, | 495 | .controller_data = &ad5304_chip_info, |
@@ -509,23 +510,45 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
509 | }; | 510 | }; |
510 | 511 | ||
511 | /* SPI controller data */ | 512 | /* SPI controller data */ |
512 | static struct bfin5xx_spi_master spi_bfin_master_info = { | 513 | static struct bfin5xx_spi_master bfin_spi0_info = { |
513 | .num_chipselect = 8, | 514 | .num_chipselect = 8, |
514 | .enable_dma = 1, /* master has the ability to do dma transfer */ | 515 | .enable_dma = 1, /* master has the ability to do dma transfer */ |
515 | }; | 516 | }; |
516 | 517 | ||
517 | static struct platform_device spi_bfin_master_device = { | 518 | /* SPI (0) */ |
518 | .name = "bfin-spi-master", | 519 | static struct resource bfin_spi0_resource[] = { |
519 | .id = 1, /* Bus number */ | 520 | [0] = { |
521 | .start = SPI0_REGBASE, | ||
522 | .end = SPI0_REGBASE + 0xFF, | ||
523 | .flags = IORESOURCE_MEM, | ||
524 | }, | ||
525 | [1] = { | ||
526 | .start = CH_SPI, | ||
527 | .end = CH_SPI, | ||
528 | .flags = IORESOURCE_IRQ, | ||
529 | }, | ||
530 | }; | ||
531 | |||
532 | static struct platform_device bfin_spi0_device = { | ||
533 | .name = "bfin-spi", | ||
534 | .id = 0, /* Bus number */ | ||
535 | .num_resources = ARRAY_SIZE(bfin_spi0_resource), | ||
536 | .resource = bfin_spi0_resource, | ||
520 | .dev = { | 537 | .dev = { |
521 | .platform_data = &spi_bfin_master_info, /* Passed to driver */ | 538 | .platform_data = &bfin_spi0_info, /* Passed to driver */ |
522 | }, | 539 | }, |
523 | }; | 540 | }; |
524 | #endif /* spi master and devices */ | 541 | #endif /* spi master and devices */ |
525 | 542 | ||
526 | #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE) | 543 | #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE) |
527 | static struct platform_device bfin_fb_device = { | 544 | static struct platform_device bfin_fb_device = { |
528 | .name = "bf537-fb", | 545 | .name = "bf537-lq035", |
546 | }; | ||
547 | #endif | ||
548 | |||
549 | #if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE) | ||
550 | static struct platform_device bfin_fb_adv7393_device = { | ||
551 | .name = "bfin-adv7393", | ||
529 | }; | 552 | }; |
530 | #endif | 553 | #endif |
531 | 554 | ||
@@ -551,9 +574,24 @@ static struct platform_device bfin_uart_device = { | |||
551 | #endif | 574 | #endif |
552 | 575 | ||
553 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | 576 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) |
577 | static struct resource bfin_twi0_resource[] = { | ||
578 | [0] = { | ||
579 | .start = TWI0_REGBASE, | ||
580 | .end = TWI0_REGBASE, | ||
581 | .flags = IORESOURCE_MEM, | ||
582 | }, | ||
583 | [1] = { | ||
584 | .start = IRQ_TWI, | ||
585 | .end = IRQ_TWI, | ||
586 | .flags = IORESOURCE_IRQ, | ||
587 | }, | ||
588 | }; | ||
589 | |||
554 | static struct platform_device i2c_bfin_twi_device = { | 590 | static struct platform_device i2c_bfin_twi_device = { |
555 | .name = "i2c-bfin-twi", | 591 | .name = "i2c-bfin-twi", |
556 | .id = 0, | 592 | .id = 0, |
593 | .num_resources = ARRAY_SIZE(bfin_twi0_resource), | ||
594 | .resource = bfin_twi0_resource, | ||
557 | }; | 595 | }; |
558 | #endif | 596 | #endif |
559 | 597 | ||
@@ -569,6 +607,43 @@ static struct platform_device bfin_sport1_uart_device = { | |||
569 | }; | 607 | }; |
570 | #endif | 608 | #endif |
571 | 609 | ||
610 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
611 | #define PATA_INT 55 | ||
612 | |||
613 | static struct pata_platform_info bfin_pata_platform_data = { | ||
614 | .ioport_shift = 1, | ||
615 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
616 | }; | ||
617 | |||
618 | static struct resource bfin_pata_resources[] = { | ||
619 | { | ||
620 | .start = 0x20314020, | ||
621 | .end = 0x2031403F, | ||
622 | .flags = IORESOURCE_MEM, | ||
623 | }, | ||
624 | { | ||
625 | .start = 0x2031401C, | ||
626 | .end = 0x2031401F, | ||
627 | .flags = IORESOURCE_MEM, | ||
628 | }, | ||
629 | { | ||
630 | .start = PATA_INT, | ||
631 | .end = PATA_INT, | ||
632 | .flags = IORESOURCE_IRQ, | ||
633 | }, | ||
634 | }; | ||
635 | |||
636 | static struct platform_device bfin_pata_device = { | ||
637 | .name = "pata_platform", | ||
638 | .id = -1, | ||
639 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
640 | .resource = bfin_pata_resources, | ||
641 | .dev = { | ||
642 | .platform_data = &bfin_pata_platform_data, | ||
643 | } | ||
644 | }; | ||
645 | #endif | ||
646 | |||
572 | static struct platform_device *stamp_devices[] __initdata = { | 647 | static struct platform_device *stamp_devices[] __initdata = { |
573 | #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) | 648 | #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) |
574 | &bfin_pcmcia_cf_device, | 649 | &bfin_pcmcia_cf_device, |
@@ -603,13 +678,17 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
603 | #endif | 678 | #endif |
604 | 679 | ||
605 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 680 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
606 | &spi_bfin_master_device, | 681 | &bfin_spi0_device, |
607 | #endif | 682 | #endif |
608 | 683 | ||
609 | #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE) | 684 | #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE) |
610 | &bfin_fb_device, | 685 | &bfin_fb_device, |
611 | #endif | 686 | #endif |
612 | 687 | ||
688 | #if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE) | ||
689 | &bfin_fb_adv7393_device, | ||
690 | #endif | ||
691 | |||
613 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 692 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) |
614 | &bfin_uart_device, | 693 | &bfin_uart_device, |
615 | #endif | 694 | #endif |
@@ -622,6 +701,10 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
622 | &bfin_sport0_uart_device, | 701 | &bfin_sport0_uart_device, |
623 | &bfin_sport1_uart_device, | 702 | &bfin_sport1_uart_device, |
624 | #endif | 703 | #endif |
704 | |||
705 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
706 | &bfin_pata_device, | ||
707 | #endif | ||
625 | }; | 708 | }; |
626 | 709 | ||
627 | static int __init stamp_init(void) | 710 | static int __init stamp_init(void) |
@@ -632,7 +715,18 @@ static int __init stamp_init(void) | |||
632 | spi_register_board_info(bfin_spi_board_info, | 715 | spi_register_board_info(bfin_spi_board_info, |
633 | ARRAY_SIZE(bfin_spi_board_info)); | 716 | ARRAY_SIZE(bfin_spi_board_info)); |
634 | #endif | 717 | #endif |
718 | |||
719 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
720 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
721 | #endif | ||
635 | return 0; | 722 | return 0; |
636 | } | 723 | } |
637 | 724 | ||
638 | arch_initcall(stamp_init); | 725 | arch_initcall(stamp_init); |
726 | |||
727 | void native_machine_restart(char *cmd) | ||
728 | { | ||
729 | /* workaround reboot hang when booting from SPI */ | ||
730 | if ((bfin_read_SYSCR() & 0x7) == 0x3) | ||
731 | bfin_gpio_reset_spi0_ssel1(); | ||
732 | } | ||
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 96ad95fab1a8..2c47db494f7d 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
@@ -35,9 +35,16 @@ | |||
35 | #include <linux/spi/spi.h> | 35 | #include <linux/spi/spi.h> |
36 | #include <linux/spi/flash.h> | 36 | #include <linux/spi/flash.h> |
37 | #include <linux/irq.h> | 37 | #include <linux/irq.h> |
38 | #include <linux/irq.h> | ||
39 | #include <linux/interrupt.h> | 38 | #include <linux/interrupt.h> |
39 | #include <linux/usb/musb.h> | ||
40 | #include <asm/bfin5xx_spi.h> | 40 | #include <asm/bfin5xx_spi.h> |
41 | #include <asm/cplb.h> | ||
42 | #include <asm/dma.h> | ||
43 | #include <asm/gpio.h> | ||
44 | #include <asm/nand.h> | ||
45 | #include <asm/mach/bf54x_keys.h> | ||
46 | #include <linux/input.h> | ||
47 | #include <linux/spi/ad7877.h> | ||
41 | 48 | ||
42 | /* | 49 | /* |
43 | * Name the Board for the /proc/cpuinfo | 50 | * Name the Board for the /proc/cpuinfo |
@@ -48,6 +55,88 @@ char *bfin_board_name = "ADSP-BF548-EZKIT"; | |||
48 | * Driver needs to know address, irq and flag pin. | 55 | * Driver needs to know address, irq and flag pin. |
49 | */ | 56 | */ |
50 | 57 | ||
58 | #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) | ||
59 | |||
60 | #include <asm/mach/bf54x-lq043.h> | ||
61 | |||
62 | static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { | ||
63 | .width = 480, | ||
64 | .height = 272, | ||
65 | .xres = {480, 480, 480}, | ||
66 | .yres = {272, 272, 272}, | ||
67 | .bpp = {24, 24, 24}, | ||
68 | .disp = GPIO_PE3, | ||
69 | }; | ||
70 | |||
71 | static struct resource bf54x_lq043_resources[] = { | ||
72 | { | ||
73 | .start = IRQ_EPPI0_ERR, | ||
74 | .end = IRQ_EPPI0_ERR, | ||
75 | .flags = IORESOURCE_IRQ, | ||
76 | }, | ||
77 | }; | ||
78 | |||
79 | static struct platform_device bf54x_lq043_device = { | ||
80 | .name = "bf54x-lq043", | ||
81 | .id = -1, | ||
82 | .num_resources = ARRAY_SIZE(bf54x_lq043_resources), | ||
83 | .resource = bf54x_lq043_resources, | ||
84 | .dev = { | ||
85 | .platform_data = &bf54x_lq043_data, | ||
86 | }, | ||
87 | }; | ||
88 | #endif | ||
89 | |||
90 | #if defined(CONFIG_KEYBOARD_BFIN) || defined(CONFIG_KEYBOARD_BFIN_MODULE) | ||
91 | static int bf548_keymap[] = { | ||
92 | KEYVAL(0, 0, KEY_ENTER), | ||
93 | KEYVAL(0, 1, KEY_HELP), | ||
94 | KEYVAL(0, 2, KEY_0), | ||
95 | KEYVAL(0, 3, KEY_BACKSPACE), | ||
96 | KEYVAL(1, 0, KEY_TAB), | ||
97 | KEYVAL(1, 1, KEY_9), | ||
98 | KEYVAL(1, 2, KEY_8), | ||
99 | KEYVAL(1, 3, KEY_7), | ||
100 | KEYVAL(2, 0, KEY_DOWN), | ||
101 | KEYVAL(2, 1, KEY_6), | ||
102 | KEYVAL(2, 2, KEY_5), | ||
103 | KEYVAL(2, 3, KEY_4), | ||
104 | KEYVAL(3, 0, KEY_UP), | ||
105 | KEYVAL(3, 1, KEY_3), | ||
106 | KEYVAL(3, 2, KEY_2), | ||
107 | KEYVAL(3, 3, KEY_1), | ||
108 | }; | ||
109 | |||
110 | static struct bfin_kpad_platform_data bf54x_kpad_data = { | ||
111 | .rows = 4, | ||
112 | .cols = 4, | ||
113 | .keymap = bf548_keymap, | ||
114 | .keymapsize = ARRAY_SIZE(bf548_keymap), | ||
115 | .repeat = 0, | ||
116 | .debounce_time = 5000, /* ns (5ms) */ | ||
117 | .coldrive_time = 1000, /* ns (1ms) */ | ||
118 | .keyup_test_interval = 50, /* ms (50ms) */ | ||
119 | }; | ||
120 | |||
121 | static struct resource bf54x_kpad_resources[] = { | ||
122 | { | ||
123 | .start = IRQ_KEY, | ||
124 | .end = IRQ_KEY, | ||
125 | .flags = IORESOURCE_IRQ, | ||
126 | }, | ||
127 | }; | ||
128 | |||
129 | static struct platform_device bf54x_kpad_device = { | ||
130 | .name = "bf54x-keys", | ||
131 | .id = -1, | ||
132 | .num_resources = ARRAY_SIZE(bf54x_kpad_resources), | ||
133 | .resource = bf54x_kpad_resources, | ||
134 | .dev = { | ||
135 | .platform_data = &bf54x_kpad_data, | ||
136 | }, | ||
137 | }; | ||
138 | #endif | ||
139 | |||
51 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | 140 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) |
52 | static struct platform_device rtc_device = { | 141 | static struct platform_device rtc_device = { |
53 | .name = "rtc-bfin", | 142 | .name = "rtc-bfin", |
@@ -94,6 +183,344 @@ static struct platform_device bfin_uart_device = { | |||
94 | }; | 183 | }; |
95 | #endif | 184 | #endif |
96 | 185 | ||
186 | #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) | ||
187 | static struct resource smsc911x_resources[] = { | ||
188 | { | ||
189 | .name = "smsc911x-memory", | ||
190 | .start = 0x24000000, | ||
191 | .end = 0x24000000 + 0xFF, | ||
192 | .flags = IORESOURCE_MEM, | ||
193 | }, | ||
194 | { | ||
195 | .start = IRQ_PE8, | ||
196 | .end = IRQ_PE8, | ||
197 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, | ||
198 | }, | ||
199 | }; | ||
200 | static struct platform_device smsc911x_device = { | ||
201 | .name = "smsc911x", | ||
202 | .id = 0, | ||
203 | .num_resources = ARRAY_SIZE(smsc911x_resources), | ||
204 | .resource = smsc911x_resources, | ||
205 | }; | ||
206 | #endif | ||
207 | |||
208 | #if defined(CONFIG_USB_BF54x_HCD) || defined(CONFIG_USB_BF54x_HCD_MODULE) | ||
209 | static struct resource bf54x_hcd_resources[] = { | ||
210 | { | ||
211 | .start = 0xFFC03C00, | ||
212 | .end = 0xFFC040FF, | ||
213 | .flags = IORESOURCE_MEM, | ||
214 | }, | ||
215 | }; | ||
216 | |||
217 | static struct platform_device bf54x_hcd = { | ||
218 | .name = "bf54x-hcd", | ||
219 | .id = 0, | ||
220 | .num_resources = ARRAY_SIZE(bf54x_hcd_resources), | ||
221 | .resource = bf54x_hcd_resources, | ||
222 | }; | ||
223 | #endif | ||
224 | |||
225 | #if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE) | ||
226 | static struct resource musb_resources[] = { | ||
227 | [0] = { | ||
228 | .start = 0xFFC03C00, | ||
229 | .end = 0xFFC040FF, | ||
230 | .flags = IORESOURCE_MEM, | ||
231 | }, | ||
232 | [1] = { /* general IRQ */ | ||
233 | .start = IRQ_USB_INT0, | ||
234 | .end = IRQ_USB_INT0, | ||
235 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | ||
236 | }, | ||
237 | [2] = { /* DMA IRQ */ | ||
238 | .start = IRQ_USB_DMA, | ||
239 | .end = IRQ_USB_DMA, | ||
240 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | ||
241 | }, | ||
242 | }; | ||
243 | |||
244 | static struct musb_hdrc_platform_data musb_plat = { | ||
245 | #ifdef CONFIG_USB_MUSB_OTG | ||
246 | .mode = MUSB_OTG, | ||
247 | #elif CONFIG_USB_MUSB_HDRC_HCD | ||
248 | .mode = MUSB_HOST, | ||
249 | #elif CONFIG_USB_GADGET_MUSB_HDRC | ||
250 | .mode = MUSB_PERIPHERAL, | ||
251 | #endif | ||
252 | .multipoint = 1, | ||
253 | }; | ||
254 | |||
255 | static u64 musb_dmamask = ~(u32)0; | ||
256 | |||
257 | static struct platform_device musb_device = { | ||
258 | .name = "musb_hdrc", | ||
259 | .id = 0, | ||
260 | .dev = { | ||
261 | .dma_mask = &musb_dmamask, | ||
262 | .coherent_dma_mask = 0xffffffff, | ||
263 | .platform_data = &musb_plat, | ||
264 | }, | ||
265 | .num_resources = ARRAY_SIZE(musb_resources), | ||
266 | .resource = musb_resources, | ||
267 | }; | ||
268 | #endif | ||
269 | |||
270 | #if defined(CONFIG_PATA_BF54X) || defined(CONFIG_PATA_BF54X_MODULE) | ||
271 | static struct resource bfin_atapi_resources[] = { | ||
272 | { | ||
273 | .start = 0xFFC03800, | ||
274 | .end = 0xFFC0386F, | ||
275 | .flags = IORESOURCE_MEM, | ||
276 | }, | ||
277 | { | ||
278 | .start = IRQ_ATAPI_ERR, | ||
279 | .end = IRQ_ATAPI_ERR, | ||
280 | .flags = IORESOURCE_IRQ, | ||
281 | }, | ||
282 | }; | ||
283 | |||
284 | static struct platform_device bfin_atapi_device = { | ||
285 | .name = "pata-bf54x", | ||
286 | .id = -1, | ||
287 | .num_resources = ARRAY_SIZE(bfin_atapi_resources), | ||
288 | .resource = bfin_atapi_resources, | ||
289 | }; | ||
290 | #endif | ||
291 | |||
292 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) | ||
293 | static struct mtd_partition partition_info[] = { | ||
294 | { | ||
295 | .name = "Linux Kernel", | ||
296 | .offset = 0, | ||
297 | .size = 4 * SIZE_1M, | ||
298 | }, | ||
299 | { | ||
300 | .name = "File System", | ||
301 | .offset = 4 * SIZE_1M, | ||
302 | .size = (256 - 4) * SIZE_1M, | ||
303 | }, | ||
304 | }; | ||
305 | |||
306 | static struct bf5xx_nand_platform bf5xx_nand_platform = { | ||
307 | .page_size = NFC_PG_SIZE_256, | ||
308 | .data_width = NFC_NWIDTH_8, | ||
309 | .partitions = partition_info, | ||
310 | .nr_partitions = ARRAY_SIZE(partition_info), | ||
311 | .rd_dly = 3, | ||
312 | .wr_dly = 3, | ||
313 | }; | ||
314 | |||
315 | static struct resource bf5xx_nand_resources[] = { | ||
316 | { | ||
317 | .start = 0xFFC03B00, | ||
318 | .end = 0xFFC03B4F, | ||
319 | .flags = IORESOURCE_MEM, | ||
320 | }, | ||
321 | { | ||
322 | .start = CH_NFC, | ||
323 | .end = CH_NFC, | ||
324 | .flags = IORESOURCE_IRQ, | ||
325 | }, | ||
326 | }; | ||
327 | |||
328 | static struct platform_device bf5xx_nand_device = { | ||
329 | .name = "bf5xx-nand", | ||
330 | .id = 0, | ||
331 | .num_resources = ARRAY_SIZE(bf5xx_nand_resources), | ||
332 | .resource = bf5xx_nand_resources, | ||
333 | .dev = { | ||
334 | .platform_data = &bf5xx_nand_platform, | ||
335 | }, | ||
336 | }; | ||
337 | #endif | ||
338 | |||
339 | #if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN) | ||
340 | static struct platform_device bf54x_sdh_device = { | ||
341 | .name = "bfin-sdh", | ||
342 | .id = 0, | ||
343 | }; | ||
344 | #endif | ||
345 | |||
346 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
347 | /* all SPI peripherals info goes here */ | ||
348 | #if defined(CONFIG_MTD_M25P80) \ | ||
349 | || defined(CONFIG_MTD_M25P80_MODULE) | ||
350 | /* SPI flash chip (m25p16) */ | ||
351 | static struct mtd_partition bfin_spi_flash_partitions[] = { | ||
352 | { | ||
353 | .name = "bootloader", | ||
354 | .size = 0x00040000, | ||
355 | .offset = 0, | ||
356 | .mask_flags = MTD_CAP_ROM | ||
357 | }, { | ||
358 | .name = "linux kernel", | ||
359 | .size = 0x1c0000, | ||
360 | .offset = 0x40000 | ||
361 | } | ||
362 | }; | ||
363 | |||
364 | static struct flash_platform_data bfin_spi_flash_data = { | ||
365 | .name = "m25p80", | ||
366 | .parts = bfin_spi_flash_partitions, | ||
367 | .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), | ||
368 | .type = "m25p16", | ||
369 | }; | ||
370 | |||
371 | static struct bfin5xx_spi_chip spi_flash_chip_info = { | ||
372 | .enable_dma = 0, /* use dma transfer with this chip*/ | ||
373 | .bits_per_word = 8, | ||
374 | .cs_change_per_word = 0, | ||
375 | }; | ||
376 | #endif | ||
377 | |||
378 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) | ||
379 | static struct bfin5xx_spi_chip spi_ad7877_chip_info = { | ||
380 | .cs_change_per_word = 1, | ||
381 | .enable_dma = 0, | ||
382 | .bits_per_word = 16, | ||
383 | }; | ||
384 | |||
385 | static const struct ad7877_platform_data bfin_ad7877_ts_info = { | ||
386 | .model = 7877, | ||
387 | .vref_delay_usecs = 50, /* internal, no capacitor */ | ||
388 | .x_plate_ohms = 419, | ||
389 | .y_plate_ohms = 486, | ||
390 | .pressure_max = 1000, | ||
391 | .pressure_min = 0, | ||
392 | .stopacq_polarity = 1, | ||
393 | .first_conversion_delay = 3, | ||
394 | .acquisition_time = 1, | ||
395 | .averaging = 1, | ||
396 | .pen_down_acc_interval = 1, | ||
397 | }; | ||
398 | #endif | ||
399 | |||
400 | static struct spi_board_info bf54x_spi_board_info[] __initdata = { | ||
401 | #if defined(CONFIG_MTD_M25P80) \ | ||
402 | || defined(CONFIG_MTD_M25P80_MODULE) | ||
403 | { | ||
404 | /* the modalias must be the same as spi device driver name */ | ||
405 | .modalias = "m25p80", /* Name of spi_driver for this device */ | ||
406 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | ||
407 | .bus_num = 0, /* Framework bus number */ | ||
408 | .chip_select = 1, /* SPI_SSEL1*/ | ||
409 | .platform_data = &bfin_spi_flash_data, | ||
410 | .controller_data = &spi_flash_chip_info, | ||
411 | .mode = SPI_MODE_3, | ||
412 | }, | ||
413 | #endif | ||
414 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) | ||
415 | { | ||
416 | .modalias = "ad7877", | ||
417 | .platform_data = &bfin_ad7877_ts_info, | ||
418 | .irq = IRQ_PJ11, | ||
419 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | ||
420 | .bus_num = 0, | ||
421 | .chip_select = 2, | ||
422 | .controller_data = &spi_ad7877_chip_info, | ||
423 | }, | ||
424 | #endif | ||
425 | }; | ||
426 | |||
427 | /* SPI (0) */ | ||
428 | static struct resource bfin_spi0_resource[] = { | ||
429 | [0] = { | ||
430 | .start = SPI0_REGBASE, | ||
431 | .end = SPI0_REGBASE + 0xFF, | ||
432 | .flags = IORESOURCE_MEM, | ||
433 | }, | ||
434 | [1] = { | ||
435 | .start = CH_SPI0, | ||
436 | .end = CH_SPI0, | ||
437 | .flags = IORESOURCE_IRQ, | ||
438 | } | ||
439 | }; | ||
440 | |||
441 | /* SPI (1) */ | ||
442 | static struct resource bfin_spi1_resource[] = { | ||
443 | [0] = { | ||
444 | .start = SPI1_REGBASE, | ||
445 | .end = SPI1_REGBASE + 0xFF, | ||
446 | .flags = IORESOURCE_MEM, | ||
447 | }, | ||
448 | [1] = { | ||
449 | .start = CH_SPI1, | ||
450 | .end = CH_SPI1, | ||
451 | .flags = IORESOURCE_IRQ, | ||
452 | } | ||
453 | }; | ||
454 | |||
455 | /* SPI controller data */ | ||
456 | static struct bfin5xx_spi_master bf54x_spi_master_info = { | ||
457 | .num_chipselect = 8, | ||
458 | .enable_dma = 1, /* master has the ability to do dma transfer */ | ||
459 | }; | ||
460 | |||
461 | static struct platform_device bf54x_spi_master0 = { | ||
462 | .name = "bfin-spi", | ||
463 | .id = 0, /* Bus number */ | ||
464 | .num_resources = ARRAY_SIZE(bfin_spi0_resource), | ||
465 | .resource = bfin_spi0_resource, | ||
466 | .dev = { | ||
467 | .platform_data = &bf54x_spi_master_info, /* Passed to driver */ | ||
468 | }, | ||
469 | }; | ||
470 | |||
471 | static struct platform_device bf54x_spi_master1 = { | ||
472 | .name = "bfin-spi", | ||
473 | .id = 1, /* Bus number */ | ||
474 | .num_resources = ARRAY_SIZE(bfin_spi1_resource), | ||
475 | .resource = bfin_spi1_resource, | ||
476 | .dev = { | ||
477 | .platform_data = &bf54x_spi_master_info, /* Passed to driver */ | ||
478 | }, | ||
479 | }; | ||
480 | #endif /* spi master and devices */ | ||
481 | |||
482 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | ||
483 | static struct resource bfin_twi0_resource[] = { | ||
484 | [0] = { | ||
485 | .start = TWI0_REGBASE, | ||
486 | .end = TWI0_REGBASE + 0xFF, | ||
487 | .flags = IORESOURCE_MEM, | ||
488 | }, | ||
489 | [1] = { | ||
490 | .start = IRQ_TWI0, | ||
491 | .end = IRQ_TWI0, | ||
492 | .flags = IORESOURCE_IRQ, | ||
493 | }, | ||
494 | }; | ||
495 | |||
496 | static struct platform_device i2c_bfin_twi0_device = { | ||
497 | .name = "i2c-bfin-twi", | ||
498 | .id = 0, | ||
499 | .num_resources = ARRAY_SIZE(bfin_twi0_resource), | ||
500 | .resource = bfin_twi0_resource, | ||
501 | }; | ||
502 | |||
503 | static struct resource bfin_twi1_resource[] = { | ||
504 | [0] = { | ||
505 | .start = TWI1_REGBASE, | ||
506 | .end = TWI1_REGBASE + 0xFF, | ||
507 | .flags = IORESOURCE_MEM, | ||
508 | }, | ||
509 | [1] = { | ||
510 | .start = IRQ_TWI1, | ||
511 | .end = IRQ_TWI1, | ||
512 | .flags = IORESOURCE_IRQ, | ||
513 | }, | ||
514 | }; | ||
515 | |||
516 | static struct platform_device i2c_bfin_twi1_device = { | ||
517 | .name = "i2c-bfin-twi", | ||
518 | .id = 1, | ||
519 | .num_resources = ARRAY_SIZE(bfin_twi1_resource), | ||
520 | .resource = bfin_twi1_resource, | ||
521 | }; | ||
522 | #endif | ||
523 | |||
97 | static struct platform_device *ezkit_devices[] __initdata = { | 524 | static struct platform_device *ezkit_devices[] __initdata = { |
98 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | 525 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) |
99 | &rtc_device, | 526 | &rtc_device, |
@@ -102,12 +529,60 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
102 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 529 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) |
103 | &bfin_uart_device, | 530 | &bfin_uart_device, |
104 | #endif | 531 | #endif |
532 | |||
533 | #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) | ||
534 | &bf54x_lq043_device, | ||
535 | #endif | ||
536 | |||
537 | #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) | ||
538 | &smsc911x_device, | ||
539 | #endif | ||
540 | |||
541 | #if defined(CONFIG_USB_BF54x_HCD) || defined(CONFIG_USB_BF54x_HCD_MODULE) | ||
542 | &bf54x_hcd, | ||
543 | #endif | ||
544 | |||
545 | #if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE) | ||
546 | &musb_device, | ||
547 | #endif | ||
548 | |||
549 | #if defined(CONFIG_PATA_BF54X) || defined(CONFIG_PATA_BF54X_MODULE) | ||
550 | &bfin_atapi_device, | ||
551 | #endif | ||
552 | |||
553 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) | ||
554 | &bf5xx_nand_device, | ||
555 | #endif | ||
556 | |||
557 | #if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN) | ||
558 | &bf54x_sdh_device, | ||
559 | #endif | ||
560 | |||
561 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
562 | &bf54x_spi_master0, | ||
563 | /* &bf54x_spi_master1,*/ | ||
564 | #endif | ||
565 | |||
566 | #if defined(CONFIG_KEYBOARD_BFIN) || defined(CONFIG_KEYBOARD_BFIN_MODULE) | ||
567 | &bf54x_kpad_device, | ||
568 | #endif | ||
569 | |||
570 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | ||
571 | &i2c_bfin_twi0_device, | ||
572 | &i2c_bfin_twi1_device, | ||
573 | #endif | ||
105 | }; | 574 | }; |
106 | 575 | ||
107 | static int __init stamp_init(void) | 576 | static int __init stamp_init(void) |
108 | { | 577 | { |
109 | printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); | 578 | printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); |
110 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); | 579 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); |
580 | |||
581 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
582 | spi_register_board_info(bf54x_spi_board_info, | ||
583 | ARRAY_SIZE(bf54x_spi_board_info)); | ||
584 | #endif | ||
585 | |||
111 | return 0; | 586 | return 0; |
112 | } | 587 | } |
113 | 588 | ||
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c index 5b2b544529a1..cd827a1b6ba1 100644 --- a/arch/blackfin/mach-bf561/boards/cm_bf561.c +++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c | |||
@@ -34,7 +34,9 @@ | |||
34 | #include <linux/spi/spi.h> | 34 | #include <linux/spi/spi.h> |
35 | #include <linux/spi/flash.h> | 35 | #include <linux/spi/flash.h> |
36 | #include <linux/usb_isp1362.h> | 36 | #include <linux/usb_isp1362.h> |
37 | #include <linux/pata_platform.h> | ||
37 | #include <linux/irq.h> | 38 | #include <linux/irq.h> |
39 | #include <asm/dma.h> | ||
38 | #include <asm/bfin5xx_spi.h> | 40 | #include <asm/bfin5xx_spi.h> |
39 | 41 | ||
40 | /* | 42 | /* |
@@ -112,7 +114,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
112 | /* the modalias must be the same as spi device driver name */ | 114 | /* the modalias must be the same as spi device driver name */ |
113 | .modalias = "m25p80", /* Name of spi_driver for this device */ | 115 | .modalias = "m25p80", /* Name of spi_driver for this device */ |
114 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 116 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ |
115 | .bus_num = 1, /* Framework bus number */ | 117 | .bus_num = 0, /* Framework bus number */ |
116 | .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/ | 118 | .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/ |
117 | .platform_data = &bfin_spi_flash_data, | 119 | .platform_data = &bfin_spi_flash_data, |
118 | .controller_data = &spi_flash_chip_info, | 120 | .controller_data = &spi_flash_chip_info, |
@@ -124,7 +126,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
124 | { | 126 | { |
125 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ | 127 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ |
126 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ | 128 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ |
127 | .bus_num = 1, /* Framework bus number */ | 129 | .bus_num = 0, /* Framework bus number */ |
128 | .chip_select = 1, /* Framework chip select. */ | 130 | .chip_select = 1, /* Framework chip select. */ |
129 | .platform_data = NULL, /* No spi_driver specific config */ | 131 | .platform_data = NULL, /* No spi_driver specific config */ |
130 | .controller_data = &spi_adc_chip_info, | 132 | .controller_data = &spi_adc_chip_info, |
@@ -135,7 +137,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
135 | { | 137 | { |
136 | .modalias = "ad1836-spi", | 138 | .modalias = "ad1836-spi", |
137 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 139 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
138 | .bus_num = 1, | 140 | .bus_num = 0, |
139 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 141 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
140 | .controller_data = &ad1836_spi_chip_info, | 142 | .controller_data = &ad1836_spi_chip_info, |
141 | }, | 143 | }, |
@@ -144,7 +146,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
144 | { | 146 | { |
145 | .modalias = "ad9960-spi", | 147 | .modalias = "ad9960-spi", |
146 | .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */ | 148 | .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */ |
147 | .bus_num = 1, | 149 | .bus_num = 0, |
148 | .chip_select = 1, | 150 | .chip_select = 1, |
149 | .controller_data = &ad9960_spi_chip_info, | 151 | .controller_data = &ad9960_spi_chip_info, |
150 | }, | 152 | }, |
@@ -153,7 +155,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
153 | { | 155 | { |
154 | .modalias = "spi_mmc", | 156 | .modalias = "spi_mmc", |
155 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 157 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ |
156 | .bus_num = 1, | 158 | .bus_num = 0, |
157 | .chip_select = CONFIG_SPI_MMC_CS_CHAN, | 159 | .chip_select = CONFIG_SPI_MMC_CS_CHAN, |
158 | .platform_data = NULL, | 160 | .platform_data = NULL, |
159 | .controller_data = &spi_mmc_chip_info, | 161 | .controller_data = &spi_mmc_chip_info, |
@@ -162,17 +164,33 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
162 | #endif | 164 | #endif |
163 | }; | 165 | }; |
164 | 166 | ||
167 | /* SPI (0) */ | ||
168 | static struct resource bfin_spi0_resource[] = { | ||
169 | [0] = { | ||
170 | .start = SPI0_REGBASE, | ||
171 | .end = SPI0_REGBASE + 0xFF, | ||
172 | .flags = IORESOURCE_MEM, | ||
173 | }, | ||
174 | [1] = { | ||
175 | .start = CH_SPI, | ||
176 | .end = CH_SPI, | ||
177 | .flags = IORESOURCE_IRQ, | ||
178 | } | ||
179 | }; | ||
180 | |||
165 | /* SPI controller data */ | 181 | /* SPI controller data */ |
166 | static struct bfin5xx_spi_master spi_bfin_master_info = { | 182 | static struct bfin5xx_spi_master bfin_spi0_info = { |
167 | .num_chipselect = 8, | 183 | .num_chipselect = 8, |
168 | .enable_dma = 1, /* master has the ability to do dma transfer */ | 184 | .enable_dma = 1, /* master has the ability to do dma transfer */ |
169 | }; | 185 | }; |
170 | 186 | ||
171 | static struct platform_device spi_bfin_master_device = { | 187 | static struct platform_device bfin_spi0_device = { |
172 | .name = "bfin-spi-master", | 188 | .name = "bfin-spi", |
173 | .id = 1, /* Bus number */ | 189 | .id = 0, /* Bus number */ |
190 | .num_resources = ARRAY_SIZE(bfin_spi0_resource), | ||
191 | .resource = bfin_spi0_resource, | ||
174 | .dev = { | 192 | .dev = { |
175 | .platform_data = &spi_bfin_master_info, /* Passed to driver */ | 193 | .platform_data = &bfin_spi0_info, /* Passed to driver */ |
176 | }, | 194 | }, |
177 | }; | 195 | }; |
178 | #endif /* spi master and devices */ | 196 | #endif /* spi master and devices */ |
@@ -256,6 +274,43 @@ static struct platform_device bfin_uart_device = { | |||
256 | }; | 274 | }; |
257 | #endif | 275 | #endif |
258 | 276 | ||
277 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
278 | #define PATA_INT 119 | ||
279 | |||
280 | static struct pata_platform_info bfin_pata_platform_data = { | ||
281 | .ioport_shift = 2, | ||
282 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
283 | }; | ||
284 | |||
285 | static struct resource bfin_pata_resources[] = { | ||
286 | { | ||
287 | .start = 0x2400C000, | ||
288 | .end = 0x2400C001F, | ||
289 | .flags = IORESOURCE_MEM, | ||
290 | }, | ||
291 | { | ||
292 | .start = 0x2400D018, | ||
293 | .end = 0x2400D01B, | ||
294 | .flags = IORESOURCE_MEM, | ||
295 | }, | ||
296 | { | ||
297 | .start = PATA_INT, | ||
298 | .end = PATA_INT, | ||
299 | .flags = IORESOURCE_IRQ, | ||
300 | }, | ||
301 | }; | ||
302 | |||
303 | static struct platform_device bfin_pata_device = { | ||
304 | .name = "pata_platform", | ||
305 | .id = -1, | ||
306 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
307 | .resource = bfin_pata_resources, | ||
308 | .dev = { | ||
309 | .platform_data = &bfin_pata_platform_data, | ||
310 | } | ||
311 | }; | ||
312 | #endif | ||
313 | |||
259 | static struct platform_device *cm_bf561_devices[] __initdata = { | 314 | static struct platform_device *cm_bf561_devices[] __initdata = { |
260 | 315 | ||
261 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 316 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) |
@@ -271,9 +326,12 @@ static struct platform_device *cm_bf561_devices[] __initdata = { | |||
271 | #endif | 326 | #endif |
272 | 327 | ||
273 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 328 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
274 | &spi_bfin_master_device, | 329 | &bfin_spi0_device, |
275 | #endif | 330 | #endif |
276 | 331 | ||
332 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
333 | &bfin_pata_device, | ||
334 | #endif | ||
277 | }; | 335 | }; |
278 | 336 | ||
279 | static int __init cm_bf561_init(void) | 337 | static int __init cm_bf561_init(void) |
@@ -283,6 +341,10 @@ static int __init cm_bf561_init(void) | |||
283 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 341 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
284 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 342 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
285 | #endif | 343 | #endif |
344 | |||
345 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
346 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
347 | #endif | ||
286 | return 0; | 348 | return 0; |
287 | } | 349 | } |
288 | 350 | ||
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c index 724191da20a2..57e14edca8b1 100644 --- a/arch/blackfin/mach-bf561/boards/ezkit.c +++ b/arch/blackfin/mach-bf561/boards/ezkit.c | |||
@@ -32,6 +32,8 @@ | |||
32 | #include <linux/spi/spi.h> | 32 | #include <linux/spi/spi.h> |
33 | #include <linux/irq.h> | 33 | #include <linux/irq.h> |
34 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
35 | #include <linux/pata_platform.h> | ||
36 | #include <asm/dma.h> | ||
35 | #include <asm/bfin5xx_spi.h> | 37 | #include <asm/bfin5xx_spi.h> |
36 | 38 | ||
37 | /* | 39 | /* |
@@ -140,17 +142,33 @@ static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | |||
140 | #endif | 142 | #endif |
141 | #endif | 143 | #endif |
142 | 144 | ||
145 | /* SPI (0) */ | ||
146 | static struct resource bfin_spi0_resource[] = { | ||
147 | [0] = { | ||
148 | .start = SPI0_REGBASE, | ||
149 | .end = SPI0_REGBASE + 0xFF, | ||
150 | .flags = IORESOURCE_MEM, | ||
151 | }, | ||
152 | [1] = { | ||
153 | .start = CH_SPI, | ||
154 | .end = CH_SPI, | ||
155 | .flags = IORESOURCE_IRQ, | ||
156 | } | ||
157 | }; | ||
158 | |||
143 | /* SPI controller data */ | 159 | /* SPI controller data */ |
144 | static struct bfin5xx_spi_master spi_bfin_master_info = { | 160 | static struct bfin5xx_spi_master bfin_spi0_info = { |
145 | .num_chipselect = 8, | 161 | .num_chipselect = 8, |
146 | .enable_dma = 1, /* master has the ability to do dma transfer */ | 162 | .enable_dma = 1, /* master has the ability to do dma transfer */ |
147 | }; | 163 | }; |
148 | 164 | ||
149 | static struct platform_device spi_bfin_master_device = { | 165 | static struct platform_device bfin_spi0_device = { |
150 | .name = "bfin-spi-master", | 166 | .name = "bfin-spi", |
151 | .id = 1, /* Bus number */ | 167 | .id = 0, /* Bus number */ |
168 | .num_resources = ARRAY_SIZE(bfin_spi0_resource), | ||
169 | .resource = bfin_spi0_resource, | ||
152 | .dev = { | 170 | .dev = { |
153 | .platform_data = &spi_bfin_master_info, /* Passed to driver */ | 171 | .platform_data = &bfin_spi0_info, /* Passed to driver */ |
154 | }, | 172 | }, |
155 | }; | 173 | }; |
156 | 174 | ||
@@ -160,23 +178,63 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
160 | { | 178 | { |
161 | .modalias = "ad1836-spi", | 179 | .modalias = "ad1836-spi", |
162 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 180 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
163 | .bus_num = 1, | 181 | .bus_num = 0, |
164 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 182 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
165 | .controller_data = &ad1836_spi_chip_info, | 183 | .controller_data = &ad1836_spi_chip_info, |
166 | }, | 184 | }, |
167 | #endif | 185 | #endif |
168 | }; | 186 | }; |
169 | 187 | ||
188 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
189 | #define PATA_INT 55 | ||
190 | |||
191 | static struct pata_platform_info bfin_pata_platform_data = { | ||
192 | .ioport_shift = 1, | ||
193 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
194 | }; | ||
195 | |||
196 | static struct resource bfin_pata_resources[] = { | ||
197 | { | ||
198 | .start = 0x20314020, | ||
199 | .end = 0x2031403F, | ||
200 | .flags = IORESOURCE_MEM, | ||
201 | }, | ||
202 | { | ||
203 | .start = 0x2031401C, | ||
204 | .end = 0x2031401F, | ||
205 | .flags = IORESOURCE_MEM, | ||
206 | }, | ||
207 | { | ||
208 | .start = PATA_INT, | ||
209 | .end = PATA_INT, | ||
210 | .flags = IORESOURCE_IRQ, | ||
211 | }, | ||
212 | }; | ||
213 | |||
214 | static struct platform_device bfin_pata_device = { | ||
215 | .name = "pata_platform", | ||
216 | .id = -1, | ||
217 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
218 | .resource = bfin_pata_resources, | ||
219 | .dev = { | ||
220 | .platform_data = &bfin_pata_platform_data, | ||
221 | } | ||
222 | }; | ||
223 | #endif | ||
224 | |||
170 | static struct platform_device *ezkit_devices[] __initdata = { | 225 | static struct platform_device *ezkit_devices[] __initdata = { |
171 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | 226 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) |
172 | &smc91x_device, | 227 | &smc91x_device, |
173 | #endif | 228 | #endif |
174 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 229 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
175 | &spi_bfin_master_device, | 230 | &bfin_spi0_device, |
176 | #endif | 231 | #endif |
177 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 232 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) |
178 | &bfin_uart_device, | 233 | &bfin_uart_device, |
179 | #endif | 234 | #endif |
235 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
236 | &bfin_pata_device, | ||
237 | #endif | ||
180 | }; | 238 | }; |
181 | 239 | ||
182 | static int __init ezkit_init(void) | 240 | static int __init ezkit_init(void) |
@@ -194,7 +252,15 @@ static int __init ezkit_init(void) | |||
194 | SSYNC(); | 252 | SSYNC(); |
195 | #endif | 253 | #endif |
196 | 254 | ||
197 | return spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 255 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
256 | spi_register_board_info(bfin_spi_board_info, | ||
257 | ARRAY_SIZE(bfin_spi_board_info)); | ||
258 | #endif | ||
259 | |||
260 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
261 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
262 | #endif | ||
263 | return 0; | ||
198 | } | 264 | } |
199 | 265 | ||
200 | arch_initcall(ezkit_init); | 266 | arch_initcall(ezkit_init); |