diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-12-21 10:04:03 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-03-09 00:30:47 -0500 |
commit | 3b781de6dd96d64c133a7ed774f385d35129575b (patch) | |
tree | 5df2deaa22f09ea5c7c3c465cc70d4a4ecaadeed | |
parent | 1dafdc513a20410e328b22b6d25d4ac78557516a (diff) |
Blackfin: drop unused SL811 platform resources from bf527/pnav boards
These platforms don't hook up to this USB controller, so no point in
declaring resources for it.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r-- | arch/blackfin/mach-bf527/boards/cm_bf527.c | 49 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 49 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/pnav10.c | 50 |
3 files changed, 0 insertions, 148 deletions
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c index eaa0131f9605..d6efdfa7d4e0 100644 --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/i2c.h> | 18 | #include <linux/i2c.h> |
19 | #include <linux/irq.h> | 19 | #include <linux/irq.h> |
20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
21 | #include <linux/usb/sl811.h> | ||
22 | #include <linux/usb/musb.h> | 21 | #include <linux/usb/musb.h> |
23 | #include <asm/dma.h> | 22 | #include <asm/dma.h> |
24 | #include <asm/bfin5xx_spi.h> | 23 | #include <asm/bfin5xx_spi.h> |
@@ -270,50 +269,6 @@ static struct platform_device dm9000_device = { | |||
270 | }; | 269 | }; |
271 | #endif | 270 | #endif |
272 | 271 | ||
273 | #if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE) | ||
274 | static struct resource sl811_hcd_resources[] = { | ||
275 | { | ||
276 | .start = 0x20340000, | ||
277 | .end = 0x20340000, | ||
278 | .flags = IORESOURCE_MEM, | ||
279 | }, { | ||
280 | .start = 0x20340004, | ||
281 | .end = 0x20340004, | ||
282 | .flags = IORESOURCE_MEM, | ||
283 | }, { | ||
284 | .start = CONFIG_USB_SL811_BFIN_IRQ, | ||
285 | .end = CONFIG_USB_SL811_BFIN_IRQ, | ||
286 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | ||
287 | }, | ||
288 | }; | ||
289 | |||
290 | #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS) | ||
291 | void sl811_port_power(struct device *dev, int is_on) | ||
292 | { | ||
293 | gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS"); | ||
294 | gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS, is_on); | ||
295 | } | ||
296 | #endif | ||
297 | |||
298 | static struct sl811_platform_data sl811_priv = { | ||
299 | .potpg = 10, | ||
300 | .power = 250, /* == 500mA */ | ||
301 | #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS) | ||
302 | .port_power = &sl811_port_power, | ||
303 | #endif | ||
304 | }; | ||
305 | |||
306 | static struct platform_device sl811_hcd_device = { | ||
307 | .name = "sl811-hcd", | ||
308 | .id = 0, | ||
309 | .dev = { | ||
310 | .platform_data = &sl811_priv, | ||
311 | }, | ||
312 | .num_resources = ARRAY_SIZE(sl811_hcd_resources), | ||
313 | .resource = sl811_hcd_resources, | ||
314 | }; | ||
315 | #endif | ||
316 | |||
317 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 272 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
318 | static struct platform_device bfin_mii_bus = { | 273 | static struct platform_device bfin_mii_bus = { |
319 | .name = "bfin_mii_bus", | 274 | .name = "bfin_mii_bus", |
@@ -929,10 +884,6 @@ static struct platform_device *cmbf527_devices[] __initdata = { | |||
929 | &rtc_device, | 884 | &rtc_device, |
930 | #endif | 885 | #endif |
931 | 886 | ||
932 | #if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE) | ||
933 | &sl811_hcd_device, | ||
934 | #endif | ||
935 | |||
936 | #if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE) | 887 | #if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE) |
937 | &bfin_isp1760_device, | 888 | &bfin_isp1760_device, |
938 | #endif | 889 | #endif |
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 0cc3581e6461..a7beed517c2e 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/i2c.h> | 16 | #include <linux/i2c.h> |
17 | #include <linux/irq.h> | 17 | #include <linux/irq.h> |
18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
19 | #include <linux/usb/sl811.h> | ||
20 | #include <linux/usb/musb.h> | 19 | #include <linux/usb/musb.h> |
21 | #include <linux/leds.h> | 20 | #include <linux/leds.h> |
22 | #include <linux/input.h> | 21 | #include <linux/input.h> |
@@ -359,50 +358,6 @@ static struct platform_device dm9000_device = { | |||
359 | }; | 358 | }; |
360 | #endif | 359 | #endif |
361 | 360 | ||
362 | #if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE) | ||
363 | static struct resource sl811_hcd_resources[] = { | ||
364 | { | ||
365 | .start = 0x20340000, | ||
366 | .end = 0x20340000, | ||
367 | .flags = IORESOURCE_MEM, | ||
368 | }, { | ||
369 | .start = 0x20340004, | ||
370 | .end = 0x20340004, | ||
371 | .flags = IORESOURCE_MEM, | ||
372 | }, { | ||
373 | .start = CONFIG_USB_SL811_BFIN_IRQ, | ||
374 | .end = CONFIG_USB_SL811_BFIN_IRQ, | ||
375 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | ||
376 | }, | ||
377 | }; | ||
378 | |||
379 | #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS) | ||
380 | void sl811_port_power(struct device *dev, int is_on) | ||
381 | { | ||
382 | gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS"); | ||
383 | gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS, is_on); | ||
384 | } | ||
385 | #endif | ||
386 | |||
387 | static struct sl811_platform_data sl811_priv = { | ||
388 | .potpg = 10, | ||
389 | .power = 250, /* == 500mA */ | ||
390 | #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS) | ||
391 | .port_power = &sl811_port_power, | ||
392 | #endif | ||
393 | }; | ||
394 | |||
395 | static struct platform_device sl811_hcd_device = { | ||
396 | .name = "sl811-hcd", | ||
397 | .id = 0, | ||
398 | .dev = { | ||
399 | .platform_data = &sl811_priv, | ||
400 | }, | ||
401 | .num_resources = ARRAY_SIZE(sl811_hcd_resources), | ||
402 | .resource = sl811_hcd_resources, | ||
403 | }; | ||
404 | #endif | ||
405 | |||
406 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 361 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
407 | static struct platform_device bfin_mii_bus = { | 362 | static struct platform_device bfin_mii_bus = { |
408 | .name = "bfin_mii_bus", | 363 | .name = "bfin_mii_bus", |
@@ -1113,10 +1068,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
1113 | &rtc_device, | 1068 | &rtc_device, |
1114 | #endif | 1069 | #endif |
1115 | 1070 | ||
1116 | #if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE) | ||
1117 | &sl811_hcd_device, | ||
1118 | #endif | ||
1119 | |||
1120 | #if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE) | 1071 | #if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE) |
1121 | &bfin_isp1760_device, | 1072 | &bfin_isp1760_device, |
1122 | #endif | 1073 | #endif |
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c index f08533d4aee8..a0f64ff0fb55 100644 --- a/arch/blackfin/mach-bf537/boards/pnav10.c +++ b/arch/blackfin/mach-bf537/boards/pnav10.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <asm/dma.h> | 17 | #include <asm/dma.h> |
18 | #include <asm/bfin5xx_spi.h> | 18 | #include <asm/bfin5xx_spi.h> |
19 | #include <asm/portmux.h> | 19 | #include <asm/portmux.h> |
20 | #include <linux/usb/sl811.h> | ||
21 | 20 | ||
22 | #include <linux/spi/ad7877.h> | 21 | #include <linux/spi/ad7877.h> |
23 | 22 | ||
@@ -99,51 +98,6 @@ static struct platform_device smc91x_device = { | |||
99 | }; | 98 | }; |
100 | #endif | 99 | #endif |
101 | 100 | ||
102 | #if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE) | ||
103 | static struct resource sl811_hcd_resources[] = { | ||
104 | { | ||
105 | .start = 0x20340000, | ||
106 | .end = 0x20340000, | ||
107 | .flags = IORESOURCE_MEM, | ||
108 | }, { | ||
109 | .start = 0x20340004, | ||
110 | .end = 0x20340004, | ||
111 | .flags = IORESOURCE_MEM, | ||
112 | }, { | ||
113 | .start = CONFIG_USB_SL811_BFIN_IRQ, | ||
114 | .end = CONFIG_USB_SL811_BFIN_IRQ, | ||
115 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | ||
116 | }, | ||
117 | }; | ||
118 | |||
119 | #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS) | ||
120 | void sl811_port_power(struct device *dev, int is_on) | ||
121 | { | ||
122 | gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS"); | ||
123 | gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS, is_on); | ||
124 | |||
125 | } | ||
126 | #endif | ||
127 | |||
128 | static struct sl811_platform_data sl811_priv = { | ||
129 | .potpg = 10, | ||
130 | .power = 250, /* == 500mA */ | ||
131 | #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS) | ||
132 | .port_power = &sl811_port_power, | ||
133 | #endif | ||
134 | }; | ||
135 | |||
136 | static struct platform_device sl811_hcd_device = { | ||
137 | .name = "sl811-hcd", | ||
138 | .id = 0, | ||
139 | .dev = { | ||
140 | .platform_data = &sl811_priv, | ||
141 | }, | ||
142 | .num_resources = ARRAY_SIZE(sl811_hcd_resources), | ||
143 | .resource = sl811_hcd_resources, | ||
144 | }; | ||
145 | #endif | ||
146 | |||
147 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 101 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
148 | static struct platform_device bfin_mii_bus = { | 102 | static struct platform_device bfin_mii_bus = { |
149 | .name = "bfin_mii_bus", | 103 | .name = "bfin_mii_bus", |
@@ -514,10 +468,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
514 | &rtc_device, | 468 | &rtc_device, |
515 | #endif | 469 | #endif |
516 | 470 | ||
517 | #if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE) | ||
518 | &sl811_hcd_device, | ||
519 | #endif | ||
520 | |||
521 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | 471 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) |
522 | &smc91x_device, | 472 | &smc91x_device, |
523 | #endif | 473 | #endif |