1 files changed, 83 insertions, 58 deletions

diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index ff5f112053d2..9a975aa0dee2 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -124,8 +124,44 @@ struct dsps_glue {
         const struct dsps_musb_wrapper *wrp; /* wrapper register offsets */
         struct timer_list timer[2];     /* otg_workaround timer */
         unsigned long last_timer[2];    /* last timer data for each instance */
+        u32 __iomem *usb_ctrl[2];
 };
 
+#define DSPS_AM33XX_CONTROL_MODULE_PHYS_0       0x44e10620
+#define DSPS_AM33XX_CONTROL_MODULE_PHYS_1       0x44e10628
+
+static const resource_size_t dsps_control_module_phys[] = {
+        DSPS_AM33XX_CONTROL_MODULE_PHYS_0,
+        DSPS_AM33XX_CONTROL_MODULE_PHYS_1,
+};
+
+/**
+ * musb_dsps_phy_control - phy on/off
+ * @glue: struct dsps_glue *
+ * @id: musb instance
+ * @on: flag for phy to be switched on or off
+ *
+ * This is to enable the PHY using usb_ctrl register in system control
+ * module space.
+ *
+ * XXX: This function will be removed once we have a seperate driver for
+ * control module
+ */
+static void musb_dsps_phy_control(struct dsps_glue *glue, u8 id, u8 on)
+{
+        u32 usbphycfg;
+
+        usbphycfg = readl(glue->usb_ctrl[id]);
+
+        if (on) {
+                usbphycfg &= ~(USBPHY_CM_PWRDN | USBPHY_OTG_PWRDN);
+                usbphycfg |= USBPHY_OTGVDET_EN | USBPHY_OTGSESSEND_EN;
+        } else {
+                usbphycfg |= USBPHY_CM_PWRDN | USBPHY_OTG_PWRDN;
+        }
+
+        writel(usbphycfg, glue->usb_ctrl[id]);
+}
 /**
  * dsps_musb_enable - enable interrupts
  */
@@ -296,7 +332,7 @@ static irqreturn_t dsps_interrupt(int irq, void *hci)
          * Also, DRVVBUS pulses for SRP (but not at 5V) ...
          */
         if (usbintr & MUSB_INTR_BABBLE)
-                pr_info("CAUTION: musb: Babble Interrupt Occured\n");
+                pr_info("CAUTION: musb: Babble Interrupt Occurred\n");
 
         if (usbintr & ((1 << wrp->drvvbus) << wrp->usb_shift)) {
                 int drvvbus = dsps_readl(reg_base, wrp->status);
@@ -365,11 +401,9 @@ static irqreturn_t dsps_interrupt(int irq, void *hci)
 static int dsps_musb_init(struct musb *musb)
 {
         struct device *dev = musb->controller;
-        struct musb_hdrc_platform_data *plat = dev->platform_data;
         struct platform_device *pdev = to_platform_device(dev);
         struct dsps_glue *glue = dev_get_drvdata(dev->parent);
         const struct dsps_musb_wrapper *wrp = glue->wrp;
-        struct omap_musb_board_data *data = plat->board_data;
         void __iomem *reg_base = musb->ctrl_base;
         u32 rev, val;
         int status;
@@ -377,7 +411,8 @@ static int dsps_musb_init(struct musb *musb)
         /* mentor core register starts at offset of 0x400 from musb base */
         musb->mregs += wrp->musb_core_offset;
 
-        /* Get the NOP PHY */
+        /* NOP driver needs change if supporting dual instance */
+        usb_nop_xceiv_register();
         musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
         if (IS_ERR_OR_NULL(musb->xceiv))
                 return -ENODEV;
@@ -395,8 +430,7 @@ static int dsps_musb_init(struct musb *musb)
         dsps_writel(reg_base, wrp->control, (1 << wrp->reset));
 
         /* Start the on-chip PHY and its PLL. */
-        if (data->set_phy_power)
-                data->set_phy_power(1);
+        musb_dsps_phy_control(glue, pdev->id, 1);
 
         musb->isr = dsps_interrupt;
 
@@ -418,16 +452,13 @@ err0:
 static int dsps_musb_exit(struct musb *musb)
 {
         struct device *dev = musb->controller;
-        struct musb_hdrc_platform_data *plat = dev->platform_data;
-        struct omap_musb_board_data *data = plat->board_data;
         struct platform_device *pdev = to_platform_device(dev);
         struct dsps_glue *glue = dev_get_drvdata(dev->parent);
 
         del_timer_sync(&glue->timer[pdev->id]);
 
         /* Shutdown the on-chip PHY and its PLL. */
-        if (data->set_phy_power)
-                data->set_phy_power(0);
+        musb_dsps_phy_control(glue, pdev->id, 0);
 
         /* NOP driver needs change if supporting dual instance */
         usb_put_phy(musb->xceiv);
@@ -448,7 +479,7 @@ static struct musb_platform_ops dsps_ops = {
 
 static u64 musb_dmamask = DMA_BIT_MASK(32);
 
-static int __devinit dsps_create_musb_pdev(struct dsps_glue *glue, u8 id)
+static int dsps_create_musb_pdev(struct dsps_glue *glue, u8 id)
 {
         struct device *dev = glue->dev;
         struct platform_device *pdev = to_platform_device(dev);
@@ -459,24 +490,33 @@ static int __devinit dsps_create_musb_pdev(struct dsps_glue *glue, u8 id)
         struct resource *res;
         struct resource resources[2];
         char res_name[11];
-        int ret, musbid;
+        int ret;
 
-        /* get memory resource */
-        snprintf(res_name, sizeof(res_name), "musb%d", id);
-        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, res_name);
+        resources[0].start = dsps_control_module_phys[id];
+        resources[0].end = resources[0].start + SZ_4 - 1;
+        resources[0].flags = IORESOURCE_MEM;
+
+        glue->usb_ctrl[id] = devm_request_and_ioremap(&pdev->dev, resources);
+        if (glue->usb_ctrl[id] == NULL) {
+                dev_err(dev, "Failed to obtain usb_ctrl%d memory\n", id);
+                ret = -ENODEV;
+                goto err0;
+        }
+
+        /* first resource is for usbss, so start index from 1 */
+        res = platform_get_resource(pdev, IORESOURCE_MEM, id + 1);
         if (!res) {
-                dev_err(dev, "%s get mem resource failed\n", res_name);
+                dev_err(dev, "failed to get memory for instance %d\n", id);
                 ret = -ENODEV;
                 goto err0;
         }
         res->parent = NULL;
         resources[0] = *res;
 
-        /* get irq resource */
-        snprintf(res_name, sizeof(res_name), "musb%d-irq", id);
-        res = platform_get_resource_byname(pdev, IORESOURCE_IRQ, res_name);
+        /* first resource is for usbss, so start index from 1 */
+        res = platform_get_resource(pdev, IORESOURCE_IRQ, id + 1);
         if (!res) {
-                dev_err(dev, "%s get irq resource failed\n", res_name);
+                dev_err(dev, "failed to get irq for instance %d\n", id);
                 ret = -ENODEV;
                 goto err0;
         }
@@ -484,22 +524,14 @@ static int __devinit dsps_create_musb_pdev(struct dsps_glue *glue, u8 id)
         resources[1] = *res;
         resources[1].name = "mc";
 
-        /* get the musb id */
-        musbid = musb_get_id(dev, GFP_KERNEL);
-        if (musbid < 0) {
-                dev_err(dev, "failed to allocate musb id\n");
-                ret = -ENOMEM;
-                goto err0;
-        }
         /* allocate the child platform device */
-        musb = platform_device_alloc("musb-hdrc", musbid);
+        musb = platform_device_alloc("musb-hdrc", PLATFORM_DEVID_AUTO);
         if (!musb) {
                 dev_err(dev, "failed to allocate musb device\n");
                 ret = -ENOMEM;
-                goto err1;
+                goto err0;
         }
 
-        musb->id                        = musbid;
         musb->dev.parent                = dev;
         musb->dev.dma_mask              = &musb_dmamask;
         musb->dev.coherent_dma_mask     = musb_dmamask;
@@ -556,20 +588,11 @@ static int __devinit dsps_create_musb_pdev(struct dsps_glue *glue, u8 id)
 
 err2:
         platform_device_put(musb);
-err1:
-        musb_put_id(dev, musbid);
 err0:
         return ret;
 }
 
-static void dsps_delete_musb_pdev(struct dsps_glue *glue, u8 id)
-{
-        musb_put_id(glue->dev, glue->musb[id]->id);
-        platform_device_del(glue->musb[id]);
-        platform_device_put(glue->musb[id]);
-}
-
-static int __devinit dsps_probe(struct platform_device *pdev)
+static int dsps_probe(struct platform_device *pdev)
 {
         struct device_node *np = pdev->dev.of_node;
         const struct of_device_id *match;
@@ -628,7 +651,7 @@ static int __devinit dsps_probe(struct platform_device *pdev)
                         dev_err(&pdev->dev, "failed to create child pdev\n");
                         /* release resources of previously created instances */
                         for (i--; i >= 0 ; i--)
-                                dsps_delete_musb_pdev(glue, i);
+                                platform_device_unregister(glue->musb[i]);
                         goto err3;
                 }
         }
@@ -645,7 +668,7 @@ err1:
 err0:
         return ret;
 }
-static int __devexit dsps_remove(struct platform_device *pdev)
+static int dsps_remove(struct platform_device *pdev)
 {
         struct dsps_glue *glue = platform_get_drvdata(pdev);
         const struct dsps_musb_wrapper *wrp = glue->wrp;
@@ -653,7 +676,7 @@ static int __devexit dsps_remove(struct platform_device *pdev)
 
         /* delete the child platform device */
         for (i = 0; i < wrp->instances ; i++)
-                dsps_delete_musb_pdev(glue, i);
+                platform_device_unregister(glue->musb[i]);
 
         /* disable usbss clocks */
         pm_runtime_put(&pdev->dev);
@@ -666,24 +689,26 @@ static int __devexit dsps_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM_SLEEP
 static int dsps_suspend(struct device *dev)
 {
-        struct musb_hdrc_platform_data *plat = dev->platform_data;
-        struct omap_musb_board_data *data = plat->board_data;
+        struct platform_device *pdev = to_platform_device(dev->parent);
+        struct dsps_glue *glue = platform_get_drvdata(pdev);
+        const struct dsps_musb_wrapper *wrp = glue->wrp;
+        int i;
 
-        /* Shutdown the on-chip PHY and its PLL. */
-        if (data->set_phy_power)
-                data->set_phy_power(0);
+        for (i = 0; i < wrp->instances; i++)
+                musb_dsps_phy_control(glue, i, 0);
 
         return 0;
 }
 
 static int dsps_resume(struct device *dev)
 {
-        struct musb_hdrc_platform_data *plat = dev->platform_data;
-        struct omap_musb_board_data *data = plat->board_data;
+        struct platform_device *pdev = to_platform_device(dev->parent);
+        struct dsps_glue *glue = platform_get_drvdata(pdev);
+        const struct dsps_musb_wrapper *wrp = glue->wrp;
+        int i;
 
-        /* Start the on-chip PHY and its PLL. */
-        if (data->set_phy_power)
-                data->set_phy_power(1);
+        for (i = 0; i < wrp->instances; i++)
+                musb_dsps_phy_control(glue, i, 1);
 
         return 0;
 }
@@ -691,7 +716,7 @@ static int dsps_resume(struct device *dev)
 
 static SIMPLE_DEV_PM_OPS(dsps_pm_ops, dsps_suspend, dsps_resume);
 
-static const struct dsps_musb_wrapper ti81xx_driver_data __devinitconst = {
+static const struct dsps_musb_wrapper ti81xx_driver_data = {
         .revision               = 0x00,
         .control                = 0x14,
         .status                 = 0x18,
@@ -719,10 +744,10 @@ static const struct dsps_musb_wrapper ti81xx_driver_data __devinitconst = {
         .rxep_bitmap            = (0xfffe << 16),
         .musb_core_offset       = 0x400,
         .poll_seconds           = 2,
-        .instances              = 2,
+        .instances              = 1,
 };
 
-static const struct platform_device_id musb_dsps_id_table[] __devinitconst = {
+static const struct platform_device_id musb_dsps_id_table[] = {
         {
                 .name   = "musb-ti81xx",
                 .driver_data    = (kernel_ulong_t) &ti81xx_driver_data,
@@ -732,7 +757,7 @@ static const struct platform_device_id musb_dsps_id_table[] __devinitconst = {
 MODULE_DEVICE_TABLE(platform, musb_dsps_id_table);
 
 #ifdef CONFIG_OF
-static const struct of_device_id musb_dsps_of_match[] __devinitconst = {
+static const struct of_device_id musb_dsps_of_match[] = {
         { .compatible = "ti,musb-am33xx",
                 .data = (void *) &ti81xx_driver_data, },
         {  },
@@ -742,7 +767,7 @@ MODULE_DEVICE_TABLE(of, musb_dsps_of_match);
 
 static struct platform_driver dsps_usbss_driver = {
         .probe          = dsps_probe,
-        .remove         = __devexit_p(dsps_remove),
+        .remove         = dsps_remove,
         .driver         = {
                 .name   = "musb-dsps",
                 .pm     = &dsps_pm_ops,