3 files changed, 70 insertions, 0 deletions

diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
index ef801563bbf5..6e180f435253 100644
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -154,6 +154,7 @@ static int __init atngw100_init(void)
         set_hw_addr(at32_add_device_eth(1, &eth_data[1]));
 
         at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));
+        at32_add_device_usba(0, NULL);
 
         for (i = 0; i < ARRAY_SIZE(ngw_leds); i++) {
                 at32_select_gpio(ngw_leds[i].gpio,
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index c9981b731efa..6b9e466104ad 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -241,6 +241,7 @@ static int __init atstk1002_init(void)
         at32_add_device_lcdc(0, &atstk1000_lcdc_data,
                              fbmem_start, fbmem_size);
 #endif
+        at32_add_device_usba(0, NULL);
 #ifndef CONFIG_BOARD_ATSTK1002_SW3_CUSTOM
         at32_add_device_ssc(0, ATMEL_SSC_TX);
 #endif
diff --git a/arch/avr32/mach-at32ap/at32ap7000.c b/arch/avr32/mach-at32ap/at32ap7000.c
index 373242aab976..f6d154ca4d24 100644
--- a/arch/avr32/mach-at32ap/at32ap7000.c
+++ b/arch/avr32/mach-at32ap/at32ap7000.c
@@ -1162,6 +1162,72 @@ at32_add_device_ssc(unsigned int id, unsigned int flags)
 }
 
 /* --------------------------------------------------------------------
+ *  USB Device Controller
+ * -------------------------------------------------------------------- */
+static struct resource usba0_resource[] __initdata = {
+        {
+                .start          = 0xff300000,
+                .end            = 0xff3fffff,
+                .flags          = IORESOURCE_MEM,
+        }, {
+                .start          = 0xfff03000,
+                .end            = 0xfff033ff,
+                .flags          = IORESOURCE_MEM,
+        },
+        IRQ(31),
+};
+static struct clk usba0_pclk = {
+        .name           = "pclk",
+        .parent         = &pbb_clk,
+        .mode           = pbb_clk_mode,
+        .get_rate       = pbb_clk_get_rate,
+        .index          = 12,
+};
+static struct clk usba0_hclk = {
+        .name           = "hclk",
+        .parent         = &hsb_clk,
+        .mode           = hsb_clk_mode,
+        .get_rate       = hsb_clk_get_rate,
+        .index          = 6,
+};
+
+struct platform_device *__init
+at32_add_device_usba(unsigned int id, struct usba_platform_data *data)
+{
+        struct platform_device *pdev;
+
+        if (id != 0)
+                return NULL;
+
+        pdev = platform_device_alloc("atmel_usba_udc", 0);
+        if (!pdev)
+                return NULL;
+
+        if (platform_device_add_resources(pdev, usba0_resource,
+                                          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->vbus_pin != GPIO_PIN_NONE)
+                        at32_select_gpio(data->vbus_pin, 0);
+        }
+
+        usba0_pclk.dev = &pdev->dev;
+        usba0_hclk.dev = &pdev->dev;
+
+        platform_device_add(pdev);
+
+        return pdev;
+
+out_free_pdev:
+        platform_device_put(pdev);
+        return NULL;
+}
+
+/* --------------------------------------------------------------------
  *  GCLK
  * -------------------------------------------------------------------- */
 static struct clk gclk0 = {
@@ -1246,6 +1312,8 @@ struct clk *at32_clock_list[] = {
         &ssc0_pclk,
         &ssc1_pclk,
         &ssc2_pclk,
+        &usba0_hclk,
+        &usba0_pclk,
         &gclk0,
         &gclk1,
         &gclk2,