Merge tag 'msm-clock-for-3.11b' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/late

From David Brown:
MSM clock updates for 3.11.

Per Stephen Boyd's coverletter:

Resending to collect higher level maintainer acks per Olof's request.
The plan is to push this patchset through MSM to the arm-soc tree.

This patchset moves the existing MSM clock code and affected drivers
to the common clock framework. A prerequisite of moving to the common
clock framework is to use clk_prepare() and clk_enable() so the first
few patches migrate drivers to that call (clk_prepare() is a no-op on
MSM right now). It also removes some custom clock APIs that MSM
provides and finally moves the proc_comm clock code to the common
struct clk.

This patch series will be used as the foundation of the MSM 8660/8960
clock code that I plan to send out after this series.

* tag 'msm-clock-for-3.11b' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
  ARM: msm: Migrate to common clock framework
  ARM: msm: Make proc_comm clock control into a platform driver
  ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver
  ARM: msm: Remove clock-7x30.h include file
  ARM: msm: Remove custom clk_set_{max,min}_rate() API
  ARM: msm: Remove custom clk_set_flags() API
  msm: iommu: Use clk_set_rate() instead of clk_set_min_rate()
  msm: iommu: Convert to clk_prepare/unprepare
  msm_sdcc: Convert to clk_prepare/unprepare
  usb: otg: msm: Convert to clk_prepare/unprepare
  msm_serial: Use devm_clk_get() and properly return errors
  msm_serial: Convert to clk_prepare/unprepare

Acked-by: Chris Ball <cjb@laptop.org> # for msm_sdcc.c
Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 19 insertions, 19 deletions

diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index 749fbf41fb6f..d08f33435e96 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -514,13 +514,13 @@ static int msm_otg_suspend(struct msm_otg *motg)
                         motg->pdata->otg_control == OTG_PMIC_CONTROL)
                 writel(readl(USB_PHY_CTRL) | PHY_RETEN, USB_PHY_CTRL);
 
-        clk_disable(motg->pclk);
-        clk_disable(motg->clk);
+        clk_disable_unprepare(motg->pclk);
+        clk_disable_unprepare(motg->clk);
         if (motg->core_clk)
-                clk_disable(motg->core_clk);
+                clk_disable_unprepare(motg->core_clk);
 
         if (!IS_ERR(motg->pclk_src))
-                clk_disable(motg->pclk_src);
+                clk_disable_unprepare(motg->pclk_src);
 
         if (motg->pdata->phy_type == SNPS_28NM_INTEGRATED_PHY &&
                         motg->pdata->otg_control == OTG_PMIC_CONTROL) {
@@ -552,12 +552,12 @@ static int msm_otg_resume(struct msm_otg *motg)
                 return 0;
 
         if (!IS_ERR(motg->pclk_src))
-                clk_enable(motg->pclk_src);
+                clk_prepare_enable(motg->pclk_src);
 
-        clk_enable(motg->pclk);
-        clk_enable(motg->clk);
+        clk_prepare_enable(motg->pclk);
+        clk_prepare_enable(motg->clk);
         if (motg->core_clk)
-                clk_enable(motg->core_clk);
+                clk_prepare_enable(motg->core_clk);
 
         if (motg->pdata->phy_type == SNPS_28NM_INTEGRATED_PHY &&
                         motg->pdata->otg_control == OTG_PMIC_CONTROL) {
@@ -1468,7 +1468,7 @@ static int __init msm_otg_probe(struct platform_device *pdev)
                 if (IS_ERR(motg->pclk_src))
                         goto put_clk;
                 clk_set_rate(motg->pclk_src, INT_MAX);
-                clk_enable(motg->pclk_src);
+                clk_prepare_enable(motg->pclk_src);
         } else
                 motg->pclk_src = ERR_PTR(-ENOENT);
 
@@ -1511,8 +1511,8 @@ static int __init msm_otg_probe(struct platform_device *pdev)
                 goto free_regs;
         }
 
-        clk_enable(motg->clk);
-        clk_enable(motg->pclk);
+        clk_prepare_enable(motg->clk);
+        clk_prepare_enable(motg->pclk);
 
         ret = msm_hsusb_init_vddcx(motg, 1);
         if (ret) {
@@ -1532,7 +1532,7 @@ static int __init msm_otg_probe(struct platform_device *pdev)
         }
 
         if (motg->core_clk)
-                clk_enable(motg->core_clk);
+                clk_prepare_enable(motg->core_clk);
 
         writel(0, USB_USBINTR);
         writel(0, USB_OTGSC);
@@ -1579,8 +1579,8 @@ static int __init msm_otg_probe(struct platform_device *pdev)
 free_irq:
         free_irq(motg->irq, motg);
 disable_clks:
-        clk_disable(motg->pclk);
-        clk_disable(motg->clk);
+        clk_disable_unprepare(motg->pclk);
+        clk_disable_unprepare(motg->clk);
 ldo_exit:
         msm_hsusb_ldo_init(motg, 0);
 vddcx_exit:
@@ -1593,7 +1593,7 @@ put_core_clk:
         clk_put(motg->pclk);
 put_pclk_src:
         if (!IS_ERR(motg->pclk_src)) {
-                clk_disable(motg->pclk_src);
+                clk_disable_unprepare(motg->pclk_src);
                 clk_put(motg->pclk_src);
         }
 put_clk:
@@ -1643,12 +1643,12 @@ static int msm_otg_remove(struct platform_device *pdev)
         if (cnt >= PHY_SUSPEND_TIMEOUT_USEC)
                 dev_err(phy->dev, "Unable to suspend PHY\n");
 
-        clk_disable(motg->pclk);
-        clk_disable(motg->clk);
+        clk_disable_unprepare(motg->pclk);
+        clk_disable_unprepare(motg->clk);
         if (motg->core_clk)
-                clk_disable(motg->core_clk);
+                clk_disable_unprepare(motg->core_clk);
         if (!IS_ERR(motg->pclk_src)) {
-                clk_disable(motg->pclk_src);
+                clk_disable_unprepare(motg->pclk_src);
                 clk_put(motg->pclk_src);
         }
         msm_hsusb_ldo_init(motg, 0);