atmel_usba_udc: move endpoint declarations into platform data.

The atmel_usba_udc driver is being used by several platforms and arches
(avr32 and at91 ATM), and each platform may have different endpoint
settings.

The patch below moves the endpoint declarations into the platform
data and make the necessary adjustments for AVR32 (improved by
Haavard Skinnemoen <hskinnemoen@atmel.com>).

Signed-off-by: Stelian Pop <stelian@popies.net>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>

1 files changed, 44 insertions, 6 deletions

diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 7678fee9a885..cb47afc9fffc 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -11,6 +11,7 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/spi/spi.h>
+#include <linux/usb/atmel_usba_udc.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -1351,9 +1352,39 @@ static struct clk usba0_hclk = {
         .index          = 6,
 };
 
+#define EP(nam, idx, maxpkt, maxbk, dma, isoc)                  \
+        [idx] = {                                               \
+                .name           = nam,                          \
+                .index          = idx,                          \
+                .fifo_size      = maxpkt,                       \
+                .nr_banks       = maxbk,                        \
+                .can_dma        = dma,                          \
+                .can_isoc       = isoc,                         \
+        }
+
+static struct usba_ep_data at32_usba_ep[] __initdata = {
+        EP("ep0",     0,   64, 1, 0, 0),
+        EP("ep1",     1,  512, 2, 1, 1),
+        EP("ep2",     2,  512, 2, 1, 1),
+        EP("ep3-int", 3,   64, 3, 1, 0),
+        EP("ep4-int", 4,   64, 3, 1, 0),
+        EP("ep5",     5, 1024, 3, 1, 1),
+        EP("ep6",     6, 1024, 3, 1, 1),
+};
+
+#undef EP
+
 struct platform_device *__init
 at32_add_device_usba(unsigned int id, struct usba_platform_data *data)
 {
+        /*
+         * pdata doesn't have room for any endpoints, so we need to
+         * append room for the ones we need right after it.
+         */
+        struct {
+                struct usba_platform_data pdata;
+                struct usba_ep_data ep[7];
+        } usba_data;
         struct platform_device *pdev;
 
         if (id != 0)
@@ -1367,13 +1398,20 @@ at32_add_device_usba(unsigned int id, struct usba_platform_data *data)
                                           ARRAY_SIZE(usba0_resource)))
                 goto out_free_pdev;
 
-        if (data) {
-                if (platform_device_add_data(pdev, data, sizeof(*data)))
-                        goto out_free_pdev;
+        if (data)
+                usba_data.pdata.vbus_pin = data->vbus_pin;
+        else
+                usba_data.pdata.vbus_pin = -EINVAL;
 
-                if (data->vbus_pin != GPIO_PIN_NONE)
-                        at32_select_gpio(data->vbus_pin, 0);
-        }
+        data = &usba_data.pdata;
+        data->num_ep = ARRAY_SIZE(at32_usba_ep);
+        memcpy(data->ep, at32_usba_ep, sizeof(at32_usba_ep));
+
+        if (platform_device_add_data(pdev, data, sizeof(usba_data)))
+                goto out_free_pdev;
+
+        if (data->vbus_pin >= 0)
+                at32_select_gpio(data->vbus_pin, 0);
 
         usba0_pclk.dev = &pdev->dev;
         usba0_hclk.dev = &pdev->dev;