1 files changed, 28 insertions, 35 deletions

diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c
index 50b4cdceccfe..640915dab6fc 100644
--- a/arch/blackfin/mach-bf561/boards/ezkit.c
+++ b/arch/blackfin/mach-bf561/boards/ezkit.c
@@ -45,51 +45,40 @@
  */
 const char bfin_board_name[] = "ADDS-BF561-EZKIT";
 
-#define ISP1761_BASE       0x2C0F0000
-#define ISP1761_IRQ        IRQ_PF10
-
 #if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
-static struct resource bfin_isp1761_resources[] = {
-        {
-                .name   = "isp1761-regs",
-                .start  = ISP1761_BASE + 0x00000000,
-                .end    = ISP1761_BASE + 0x000fffff,
+#include <linux/usb/isp1760.h>
+static struct resource bfin_isp1760_resources[] = {
+        [0] = {
+                .start  = 0x2C0F0000,
+                .end    = 0x203C0000 + 0xfffff,
                 .flags  = IORESOURCE_MEM,
         },
-        {
-                .start  = ISP1761_IRQ,
-                .end    = ISP1761_IRQ,
+        [1] = {
+                .start  = IRQ_PF10,
+                .end    = IRQ_PF10,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
-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(ISP1761_IRQ, 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_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
@@ -449,6 +438,10 @@ static struct platform_device *ezkit_devices[] __initdata = {
         &net2272_bfin_device,
 #endif
 
+#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+        &bfin_isp1760_device,
+#endif
+
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
         &bfin_spi0_device,
 #endif