aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-bf537
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-09-24 01:44:36 -0400
committerMike Frysinger <vapier@gentoo.org>2009-12-15 00:13:58 -0500
commit21b03cfe4c50fd586bfebd06d852457c07f60c2b (patch)
treef16105f94bcb680af7ed3bf99938ea3b9c226ca5 /arch/blackfin/mach-bf537
parent5cd82a6d58cb14c3a5d08ed171229de7adc3deac (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-bf537')
-rw-r--r--arch/blackfin/mach-bf537/boards/pnav10.c46
-rw-r--r--arch/blackfin/mach-bf537/boards/stamp.c4
2 files changed, 2 insertions, 48 deletions
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index 9ba290466b56..4e0afda472ab 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -13,9 +13,6 @@
13#include <linux/mtd/partitions.h> 13#include <linux/mtd/partitions.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/irq.h> 16#include <linux/irq.h>
20#include <asm/dma.h> 17#include <asm/dma.h>
21#include <asm/bfin5xx_spi.h> 18#include <asm/bfin5xx_spi.h>
@@ -147,45 +144,6 @@ static struct platform_device sl811_hcd_device = {
147}; 144};
148#endif 145#endif
149 146
150#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
151static struct resource isp1362_hcd_resources[] = {
152 {
153 .start = 0x20360000,
154 .end = 0x20360000,
155 .flags = IORESOURCE_MEM,
156 }, {
157 .start = 0x20360004,
158 .end = 0x20360004,
159 .flags = IORESOURCE_MEM,
160 }, {
161 .start = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,
162 .end = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,
163 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
164 },
165};
166
167static struct isp1362_platform_data isp1362_priv = {
168 .sel15Kres = 1,
169 .clknotstop = 0,
170 .oc_enable = 0,
171 .int_act_high = 0,
172 .int_edge_triggered = 0,
173 .remote_wakeup_connected = 0,
174 .no_power_switching = 1,
175 .power_switching_mode = 0,
176};
177
178static struct platform_device isp1362_hcd_device = {
179 .name = "isp1362-hcd",
180 .id = 0,
181 .dev = {
182 .platform_data = &isp1362_priv,
183 },
184 .num_resources = ARRAY_SIZE(isp1362_hcd_resources),
185 .resource = isp1362_hcd_resources,
186};
187#endif
188
189#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) 147#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
190static struct platform_device bfin_mii_bus = { 148static struct platform_device bfin_mii_bus = {
191 .name = "bfin_mii_bus", 149 .name = "bfin_mii_bus",
@@ -492,10 +450,6 @@ static struct platform_device *stamp_devices[] __initdata = {
492 &sl811_hcd_device, 450 &sl811_hcd_device,
493#endif 451#endif
494 452
495#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
496 &isp1362_hcd_device,
497#endif
498
499#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) 453#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
500 &smc91x_device, 454 &smc91x_device,
501#endif 455#endif
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 6a09b71c96cc..514d9949ea75 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -272,8 +272,8 @@ static struct resource isp1362_hcd_resources[] = {
272 .end = 0x20360004, 272 .end = 0x20360004,
273 .flags = IORESOURCE_MEM, 273 .flags = IORESOURCE_MEM,
274 }, { 274 }, {
275 .start = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ, 275 .start = IRQ_PF3,
276 .end = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ, 276 .end = IRQ_PF3,
277 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, 277 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
278 }, 278 },
279}; 279};