diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-09-24 01:44:36 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-12-15 00:13:58 -0500 |
commit | 21b03cfe4c50fd586bfebd06d852457c07f60c2b (patch) | |
tree | f16105f94bcb680af7ed3bf99938ea3b9c226ca5 /arch/blackfin/mach-bf527 | |
parent | 5cd82a6d58cb14c3a5d08ed171229de7adc3deac (diff) |
Blackfin: clean up isp1362 board resources
Drop the CONFIG_USB_ISP1362_BFIN_GPIO_IRQ Kconfig as it never made it into
mainline and it was a bad interface into the board resources. For boards
that actually used this, replace it with an actual IRQ define. For boards
that didn't, simply drop the resources.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/mach-bf527')
-rw-r--r-- | arch/blackfin/mach-bf527/boards/cm_bf527.c | 46 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 46 |
2 files changed, 0 insertions, 92 deletions
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c index f1996b13a3da..40b993449917 100644 --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c | |||
@@ -15,9 +15,6 @@ | |||
15 | #include <linux/spi/spi.h> | 15 | #include <linux/spi/spi.h> |
16 | #include <linux/spi/flash.h> | 16 | #include <linux/spi/flash.h> |
17 | #include <linux/etherdevice.h> | 17 | #include <linux/etherdevice.h> |
18 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | ||
19 | #include <linux/usb/isp1362.h> | ||
20 | #endif | ||
21 | #include <linux/i2c.h> | 18 | #include <linux/i2c.h> |
22 | #include <linux/irq.h> | 19 | #include <linux/irq.h> |
23 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
@@ -317,45 +314,6 @@ static struct platform_device sl811_hcd_device = { | |||
317 | }; | 314 | }; |
318 | #endif | 315 | #endif |
319 | 316 | ||
320 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | ||
321 | static struct resource isp1362_hcd_resources[] = { | ||
322 | { | ||
323 | .start = 0x20360000, | ||
324 | .end = 0x20360000, | ||
325 | .flags = IORESOURCE_MEM, | ||
326 | }, { | ||
327 | .start = 0x20360004, | ||
328 | .end = 0x20360004, | ||
329 | .flags = IORESOURCE_MEM, | ||
330 | }, { | ||
331 | .start = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ, | ||
332 | .end = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ, | ||
333 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | ||
334 | }, | ||
335 | }; | ||
336 | |||
337 | static struct isp1362_platform_data isp1362_priv = { | ||
338 | .sel15Kres = 1, | ||
339 | .clknotstop = 0, | ||
340 | .oc_enable = 0, | ||
341 | .int_act_high = 0, | ||
342 | .int_edge_triggered = 0, | ||
343 | .remote_wakeup_connected = 0, | ||
344 | .no_power_switching = 1, | ||
345 | .power_switching_mode = 0, | ||
346 | }; | ||
347 | |||
348 | static struct platform_device isp1362_hcd_device = { | ||
349 | .name = "isp1362-hcd", | ||
350 | .id = 0, | ||
351 | .dev = { | ||
352 | .platform_data = &isp1362_priv, | ||
353 | }, | ||
354 | .num_resources = ARRAY_SIZE(isp1362_hcd_resources), | ||
355 | .resource = isp1362_hcd_resources, | ||
356 | }; | ||
357 | #endif | ||
358 | |||
359 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 317 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
360 | static struct platform_device bfin_mii_bus = { | 318 | static struct platform_device bfin_mii_bus = { |
361 | .name = "bfin_mii_bus", | 319 | .name = "bfin_mii_bus", |
@@ -841,10 +799,6 @@ static struct platform_device *cmbf527_devices[] __initdata = { | |||
841 | &sl811_hcd_device, | 799 | &sl811_hcd_device, |
842 | #endif | 800 | #endif |
843 | 801 | ||
844 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | ||
845 | &isp1362_hcd_device, | ||
846 | #endif | ||
847 | |||
848 | #if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE) | 802 | #if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE) |
849 | &bfin_isp1760_device, | 803 | &bfin_isp1760_device, |
850 | #endif | 804 | #endif |
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 45db07b5221b..6ffbefc44433 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -13,9 +13,6 @@ | |||
13 | #include <linux/mtd/physmap.h> | 13 | #include <linux/mtd/physmap.h> |
14 | #include <linux/spi/spi.h> | 14 | #include <linux/spi/spi.h> |
15 | #include <linux/spi/flash.h> | 15 | #include <linux/spi/flash.h> |
16 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | ||
17 | #include <linux/usb/isp1362.h> | ||
18 | #endif | ||
19 | #include <linux/i2c.h> | 16 | #include <linux/i2c.h> |
20 | #include <linux/irq.h> | 17 | #include <linux/irq.h> |
21 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
@@ -373,45 +370,6 @@ static struct platform_device sl811_hcd_device = { | |||
373 | }; | 370 | }; |
374 | #endif | 371 | #endif |
375 | 372 | ||
376 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | ||
377 | static struct resource isp1362_hcd_resources[] = { | ||
378 | { | ||
379 | .start = 0x20360000, | ||
380 | .end = 0x20360000, | ||
381 | .flags = IORESOURCE_MEM, | ||
382 | }, { | ||
383 | .start = 0x20360004, | ||
384 | .end = 0x20360004, | ||
385 | .flags = IORESOURCE_MEM, | ||
386 | }, { | ||
387 | .start = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ, | ||
388 | .end = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ, | ||
389 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | ||
390 | }, | ||
391 | }; | ||
392 | |||
393 | static struct isp1362_platform_data isp1362_priv = { | ||
394 | .sel15Kres = 1, | ||
395 | .clknotstop = 0, | ||
396 | .oc_enable = 0, | ||
397 | .int_act_high = 0, | ||
398 | .int_edge_triggered = 0, | ||
399 | .remote_wakeup_connected = 0, | ||
400 | .no_power_switching = 1, | ||
401 | .power_switching_mode = 0, | ||
402 | }; | ||
403 | |||
404 | static struct platform_device isp1362_hcd_device = { | ||
405 | .name = "isp1362-hcd", | ||
406 | .id = 0, | ||
407 | .dev = { | ||
408 | .platform_data = &isp1362_priv, | ||
409 | }, | ||
410 | .num_resources = ARRAY_SIZE(isp1362_hcd_resources), | ||
411 | .resource = isp1362_hcd_resources, | ||
412 | }; | ||
413 | #endif | ||
414 | |||
415 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 373 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
416 | static struct platform_device bfin_mii_bus = { | 374 | static struct platform_device bfin_mii_bus = { |
417 | .name = "bfin_mii_bus", | 375 | .name = "bfin_mii_bus", |
@@ -918,10 +876,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
918 | &sl811_hcd_device, | 876 | &sl811_hcd_device, |
919 | #endif | 877 | #endif |
920 | 878 | ||
921 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | ||
922 | &isp1362_hcd_device, | ||
923 | #endif | ||
924 | |||
925 | #if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE) | 879 | #if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE) |
926 | &bfin_isp1760_device, | 880 | &bfin_isp1760_device, |
927 | #endif | 881 | #endif |