usb: gadget: tegra: Enable emc clock while usb is connected

Change-Id: Icb94c516a580e29b42b1899e622c9b91f8701dd2
Signed-off-by: Benoit Goby <benoit@android.com>

diff --git a/drivers/usb/gadget/fsl_tegra_udc.c b/drivers/usb/gadget/fsl_tegra_udc.c
index 6091d1f7ea0cea4a82a4c11bc9b24b2c8118d321..74c1d0b52541a39e2ced5e18239ba2c666d0eeeb 100644 (file)
--- a/drivers/usb/gadget/fsl_tegra_udc.c
+++ b/drivers/usb/gadget/fsl_tegra_udc.c
@@ -15,6 +15,7 @@
 
 static struct tegra_usb_phy *phy;
 static struct clk *udc_clk;
+static struct clk *emc_clk;
 static void *udc_base;
 
 int fsl_udc_clk_init(struct platform_device *pdev)
@@ -33,6 +34,16 @@ int fsl_udc_clk_init(struct platform_device *pdev)
 
        clk_enable(udc_clk);
 
+       emc_clk = clk_get(&pdev->dev, "emc");
+       if (IS_ERR(emc_clk)) {
+               dev_err(&pdev->dev, "Can't get emc clock\n");
+               err = PTR_ERR(emc_clk);
+               goto err_emc;
+       }
+
+       clk_enable(emc_clk);
+       clk_set_rate(emc_clk, 240000000);
+
        /* we have to remap the registers ourselves as fsl_udc does not
         * export them for us.
         */
@@ -65,6 +76,9 @@ int fsl_udc_clk_init(struct platform_device *pdev)
 err1:
        iounmap(udc_base);
 err0:
+       clk_disable(emc_clk);
+       clk_put(emc_clk);
+err_emc:
        clk_disable(udc_clk);
        clk_put(udc_clk);
        return err;
@@ -82,16 +96,21 @@ void fsl_udc_clk_release(void)
 
        clk_disable(udc_clk);
        clk_put(udc_clk);
+
+       clk_disable(emc_clk);
+       clk_put(emc_clk);
 }
 
 void fsl_udc_clk_suspend(void)
 {
        tegra_usb_phy_power_off(phy);
        clk_disable(udc_clk);
+       clk_disable(emc_clk);
 }
 
 void fsl_udc_clk_resume(void)
 {
+       clk_enable(emc_clk);
        clk_enable(udc_clk);
        tegra_usb_phy_power_on(phy);
 }