diff options
-rw-r--r-- | arch/blackfin/mach-bf527/boards/cm_bf527.c | 14 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 14 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/boards/cm_bf548.c | 14 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 14 |
4 files changed, 44 insertions, 12 deletions
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c index d22bc7773717..986483fb69fa 100644 --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c | |||
@@ -43,9 +43,7 @@ | |||
43 | #include <linux/irq.h> | 43 | #include <linux/irq.h> |
44 | #include <linux/interrupt.h> | 44 | #include <linux/interrupt.h> |
45 | #include <linux/usb/sl811.h> | 45 | #include <linux/usb/sl811.h> |
46 | #if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE) | ||
47 | #include <linux/usb/musb.h> | 46 | #include <linux/usb/musb.h> |
48 | #endif | ||
49 | #include <asm/cplb.h> | 47 | #include <asm/cplb.h> |
50 | #include <asm/dma.h> | 48 | #include <asm/dma.h> |
51 | #include <asm/bfin5xx_spi.h> | 49 | #include <asm/bfin5xx_spi.h> |
@@ -130,6 +128,16 @@ static struct resource musb_resources[] = { | |||
130 | }, | 128 | }, |
131 | }; | 129 | }; |
132 | 130 | ||
131 | static struct musb_hdrc_config musb_config = { | ||
132 | .multipoint = 0, | ||
133 | .dyn_fifo = 0, | ||
134 | .soft_con = 1, | ||
135 | .dma = 1, | ||
136 | .num_eps = 7, | ||
137 | .dma_channels = 7, | ||
138 | .gpio_vrsel = GPIO_PF11, | ||
139 | }; | ||
140 | |||
133 | static struct musb_hdrc_platform_data musb_plat = { | 141 | static struct musb_hdrc_platform_data musb_plat = { |
134 | #if defined(CONFIG_USB_MUSB_OTG) | 142 | #if defined(CONFIG_USB_MUSB_OTG) |
135 | .mode = MUSB_OTG, | 143 | .mode = MUSB_OTG, |
@@ -138,7 +146,7 @@ static struct musb_hdrc_platform_data musb_plat = { | |||
138 | #elif defined(CONFIG_USB_GADGET_MUSB_HDRC) | 146 | #elif defined(CONFIG_USB_GADGET_MUSB_HDRC) |
139 | .mode = MUSB_PERIPHERAL, | 147 | .mode = MUSB_PERIPHERAL, |
140 | #endif | 148 | #endif |
141 | .multipoint = 0, | 149 | .config = &musb_config, |
142 | }; | 150 | }; |
143 | 151 | ||
144 | static u64 musb_dmamask = ~(u32)0; | 152 | static u64 musb_dmamask = ~(u32)0; |
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 762f754c06cc..a756934482cf 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -42,9 +42,7 @@ | |||
42 | #include <linux/irq.h> | 42 | #include <linux/irq.h> |
43 | #include <linux/interrupt.h> | 43 | #include <linux/interrupt.h> |
44 | #include <linux/usb/sl811.h> | 44 | #include <linux/usb/sl811.h> |
45 | #if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE) | ||
46 | #include <linux/usb/musb.h> | 45 | #include <linux/usb/musb.h> |
47 | #endif | ||
48 | #include <asm/cplb.h> | 46 | #include <asm/cplb.h> |
49 | #include <asm/dma.h> | 47 | #include <asm/dma.h> |
50 | #include <asm/bfin5xx_spi.h> | 48 | #include <asm/bfin5xx_spi.h> |
@@ -129,6 +127,16 @@ static struct resource musb_resources[] = { | |||
129 | }, | 127 | }, |
130 | }; | 128 | }; |
131 | 129 | ||
130 | static struct musb_hdrc_config musb_config = { | ||
131 | .multipoint = 0, | ||
132 | .dyn_fifo = 0, | ||
133 | .soft_con = 1, | ||
134 | .dma = 1, | ||
135 | .num_eps = 7, | ||
136 | .dma_channels = 7, | ||
137 | .gpio_vrsel = GPIO_PG13, | ||
138 | }; | ||
139 | |||
132 | static struct musb_hdrc_platform_data musb_plat = { | 140 | static struct musb_hdrc_platform_data musb_plat = { |
133 | #if defined(CONFIG_USB_MUSB_OTG) | 141 | #if defined(CONFIG_USB_MUSB_OTG) |
134 | .mode = MUSB_OTG, | 142 | .mode = MUSB_OTG, |
@@ -137,7 +145,7 @@ static struct musb_hdrc_platform_data musb_plat = { | |||
137 | #elif defined(CONFIG_USB_GADGET_MUSB_HDRC) | 145 | #elif defined(CONFIG_USB_GADGET_MUSB_HDRC) |
138 | .mode = MUSB_PERIPHERAL, | 146 | .mode = MUSB_PERIPHERAL, |
139 | #endif | 147 | #endif |
140 | .multipoint = 0, | 148 | .config = &musb_config, |
141 | }; | 149 | }; |
142 | 150 | ||
143 | static u64 musb_dmamask = ~(u32)0; | 151 | static u64 musb_dmamask = ~(u32)0; |
diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c index ce934ee174e0..36f56f9ffd05 100644 --- a/arch/blackfin/mach-bf548/boards/cm_bf548.c +++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c | |||
@@ -36,9 +36,7 @@ | |||
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/interrupt.h> | 38 | #include <linux/interrupt.h> |
39 | #if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE) | ||
40 | #include <linux/usb/musb.h> | 39 | #include <linux/usb/musb.h> |
41 | #endif | ||
42 | #include <asm/bfin5xx_spi.h> | 40 | #include <asm/bfin5xx_spi.h> |
43 | #include <asm/cplb.h> | 41 | #include <asm/cplb.h> |
44 | #include <asm/dma.h> | 42 | #include <asm/dma.h> |
@@ -268,6 +266,16 @@ static struct resource musb_resources[] = { | |||
268 | }, | 266 | }, |
269 | }; | 267 | }; |
270 | 268 | ||
269 | static struct musb_hdrc_config musb_config = { | ||
270 | .multipoint = 0, | ||
271 | .dyn_fifo = 0, | ||
272 | .soft_con = 1, | ||
273 | .dma = 1, | ||
274 | .num_eps = 7, | ||
275 | .dma_channels = 7, | ||
276 | .gpio_vrsel = GPIO_PH6, | ||
277 | }; | ||
278 | |||
271 | static struct musb_hdrc_platform_data musb_plat = { | 279 | static struct musb_hdrc_platform_data musb_plat = { |
272 | #if defined(CONFIG_USB_MUSB_OTG) | 280 | #if defined(CONFIG_USB_MUSB_OTG) |
273 | .mode = MUSB_OTG, | 281 | .mode = MUSB_OTG, |
@@ -276,7 +284,7 @@ static struct musb_hdrc_platform_data musb_plat = { | |||
276 | #elif defined(CONFIG_USB_GADGET_MUSB_HDRC) | 284 | #elif defined(CONFIG_USB_GADGET_MUSB_HDRC) |
277 | .mode = MUSB_PERIPHERAL, | 285 | .mode = MUSB_PERIPHERAL, |
278 | #endif | 286 | #endif |
279 | .multipoint = 0, | 287 | .config = &musb_config, |
280 | }; | 288 | }; |
281 | 289 | ||
282 | static u64 musb_dmamask = ~(u32)0; | 290 | static u64 musb_dmamask = ~(u32)0; |
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 39357693046d..d22515d080a0 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
@@ -38,9 +38,7 @@ | |||
38 | #include <linux/irq.h> | 38 | #include <linux/irq.h> |
39 | #include <linux/i2c.h> | 39 | #include <linux/i2c.h> |
40 | #include <linux/interrupt.h> | 40 | #include <linux/interrupt.h> |
41 | #if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE) | ||
42 | #include <linux/usb/musb.h> | 41 | #include <linux/usb/musb.h> |
43 | #endif | ||
44 | #include <asm/bfin5xx_spi.h> | 42 | #include <asm/bfin5xx_spi.h> |
45 | #include <asm/cplb.h> | 43 | #include <asm/cplb.h> |
46 | #include <asm/dma.h> | 44 | #include <asm/dma.h> |
@@ -314,6 +312,16 @@ static struct resource musb_resources[] = { | |||
314 | }, | 312 | }, |
315 | }; | 313 | }; |
316 | 314 | ||
315 | static struct musb_hdrc_config musb_config = { | ||
316 | .multipoint = 0, | ||
317 | .dyn_fifo = 0, | ||
318 | .soft_con = 1, | ||
319 | .dma = 1, | ||
320 | .num_eps = 7, | ||
321 | .dma_channels = 7, | ||
322 | .gpio_vrsel = GPIO_PE7, | ||
323 | }; | ||
324 | |||
317 | static struct musb_hdrc_platform_data musb_plat = { | 325 | static struct musb_hdrc_platform_data musb_plat = { |
318 | #if defined(CONFIG_USB_MUSB_OTG) | 326 | #if defined(CONFIG_USB_MUSB_OTG) |
319 | .mode = MUSB_OTG, | 327 | .mode = MUSB_OTG, |
@@ -322,7 +330,7 @@ static struct musb_hdrc_platform_data musb_plat = { | |||
322 | #elif defined(CONFIG_USB_GADGET_MUSB_HDRC) | 330 | #elif defined(CONFIG_USB_GADGET_MUSB_HDRC) |
323 | .mode = MUSB_PERIPHERAL, | 331 | .mode = MUSB_PERIPHERAL, |
324 | #endif | 332 | #endif |
325 | .multipoint = 0, | 333 | .config = &musb_config, |
326 | }; | 334 | }; |
327 | 335 | ||
328 | static u64 musb_dmamask = ~(u32)0; | 336 | static u64 musb_dmamask = ~(u32)0; |