mfd: omap-usb-tll: Move configuration code to omap_tll_init()

This is because we want to get rid of platform_data usage from probe().
The only information we need is PORT_MODE, and this can be supplied
to us by the user (i.e. omap-usb-host.c).

We also move channel clock management from runtime PM handlers into
omap_tll_enable/disable().

Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 2520facd4ccc..eb5db28b3fbd 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -278,7 +278,7 @@ static int usbhs_runtime_resume(struct device *dev)
 
         dev_dbg(dev, "usbhs_runtime_resume\n");
 
-        omap_tll_enable();
+        omap_tll_enable(pdata);
 
         if (!IS_ERR(omap->ehci_logic_fck))
                 clk_enable(omap->ehci_logic_fck);
@@ -353,7 +353,7 @@ static int usbhs_runtime_suspend(struct device *dev)
         if (!IS_ERR(omap->ehci_logic_fck))
                 clk_disable(omap->ehci_logic_fck);
 
-        omap_tll_disable();
+        omap_tll_disable(pdata);
 
         return 0;
 }
@@ -527,6 +527,9 @@ static int usbhs_omap_probe(struct platform_device *pdev)
 
         omap->pdata = pdata;
 
+        /* Initialize the TLL subsystem */
+        omap_tll_init(pdata);
+
         pm_runtime_enable(dev);
 
         platform_set_drvdata(pdev, omap);