Blackfin arch: Enable ISP1760 USB Host Driver in platform device initialization code.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

1 files changed, 22 insertions, 25 deletions

diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index 5288187a3ace..c0fd469d04c7 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -59,9 +59,9 @@ const char bfin_board_name[] = "ADSP-BF548-EZKIT";
  */
 
 #if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
-static struct resource bfin_isp1761_resources[] = {
+#include <linux/usb/isp1760.h>
+static struct resource bfin_isp1760_resources[] = {
         [0] = {
-                .name   = "isp1761-regs",
                 .start  = 0x2C0C0000,
                 .end    = 0x2C0C0000 + 0xfffff,
                 .flags  = IORESOURCE_MEM,
@@ -73,32 +73,25 @@ static struct resource bfin_isp1761_resources[] = {
         },
 };
 
-static struct platform_device bfin_isp1761_device = {
-        .name           = "isp1761",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(bfin_isp1761_resources),
-        .resource       = bfin_isp1761_resources,
+static struct isp1760_platform_data isp1760_priv = {
+        .is_isp1761 = 0,
+        .port1_disable = 0,
+        .bus_width_16 = 1,
+        .port1_otg = 0,
+        .analog_oc = 0,
+        .dack_polarity_high = 0,
+        .dreq_polarity_high = 0,
 };
 
-static struct platform_device *bfin_isp1761_devices[] = {
-        &bfin_isp1761_device,
+static struct platform_device bfin_isp1760_device = {
+        .name           = "isp1760-hcd",
+        .id             = 0,
+        .dev = {
+                .platform_data = &isp1760_priv,
+        },
+        .num_resources  = ARRAY_SIZE(bfin_isp1760_resources),
+        .resource       = bfin_isp1760_resources,
 };
-
-int __init bfin_isp1761_init(void)
-{
-        unsigned int num_devices = ARRAY_SIZE(bfin_isp1761_devices);
-
-        printk(KERN_INFO "%s(): registering device resources\n", __func__);
-        set_irq_type(bfin_isp1761_resources[1].start, IRQF_TRIGGER_FALLING);
-
-        return platform_add_devices(bfin_isp1761_devices, num_devices);
-}
-
-void __exit bfin_isp1761_exit(void)
-{
-        platform_device_unregister(&bfin_isp1761_device);
-}
-arch_initcall(bfin_isp1761_init);
 #endif
 
 #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE)
@@ -827,6 +820,10 @@ static struct platform_device *ezkit_devices[] __initdata = {
         &musb_device,
 #endif
 
+#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+        &bfin_isp1760_device,
+#endif
+
 #if defined(CONFIG_PATA_BF54X) || defined(CONFIG_PATA_BF54X_MODULE)
         &bfin_atapi_device,
 #endif