ASoC: Ux500: Control apb clock

When switching to common clock driver for ux500 this clock needs to
be handled as well. Before this clock was internally managed by the
clock driver itself.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c
index e11187f..74bb3c0 100644 (file)
--- a/sound/soc/ux500/ux500_msp_dai.c
+++ b/sound/soc/ux500/ux500_msp_dai.c
@@ -398,13 +398,28 @@ static int ux500_msp_dai_startup(struct snd_pcm_substream *substream,
                return ret;
        }
 
-       /* Prepare and enable clock */
-       dev_dbg(dai->dev, "%s: Enabling MSP-clock.\n", __func__);
+       /* Prepare and enable clocks */
+       dev_dbg(dai->dev, "%s: Enabling MSP-clocks.\n", __func__);
+       ret = clk_prepare_enable(drvdata->pclk);
+       if (ret) {
+               dev_err(drvdata->msp->dev,
+                       "%s: Failed to prepare/enable pclk!\n", __func__);
+               goto err_pclk;
+       }
+
        ret = clk_prepare_enable(drvdata->clk);
-       if (ret)
-               regulator_disable(drvdata->reg_vape);
+       if (ret) {
+               dev_err(drvdata->msp->dev,
+                       "%s: Failed to prepare/enable clk!\n", __func__);
+               goto err_clk;
+       }
 
        return ret;
+err_clk:
+       clk_disable_unprepare(drvdata->pclk);
+err_pclk:
+       regulator_disable(drvdata->reg_vape);
+       return ret;
 }
 
 static void ux500_msp_dai_shutdown(struct snd_pcm_substream *substream,
@@ -430,8 +445,9 @@ static void ux500_msp_dai_shutdown(struct snd_pcm_substream *substream,
                        __func__, dai->id, snd_pcm_stream_str(substream));
        }
 
-       /* Disable and unprepare clock */
+       /* Disable and unprepare clocks */
        clk_disable_unprepare(drvdata->clk);
+       clk_disable_unprepare(drvdata->pclk);
 
        /* Disable regulator */
        ret = regulator_disable(drvdata->reg_vape);
@@ -782,6 +798,14 @@ static int __devinit ux500_msp_drv_probe(struct platform_device *pdev)
        }
        prcmu_qos_add_requirement(PRCMU_QOS_APE_OPP, (char *)pdev->name, 50);
 
+       drvdata->pclk = clk_get(&pdev->dev, "apb_pclk");
+       if (IS_ERR(drvdata->pclk)) {
+               ret = (int)PTR_ERR(drvdata->pclk);
+               dev_err(&pdev->dev, "%s: ERROR: clk_get of pclk failed (%d)!\n",
+                       __func__, ret);
+               goto err_pclk;
+       }
+
        drvdata->clk = clk_get(&pdev->dev, NULL);
        if (IS_ERR(drvdata->clk)) {
                ret = (int)PTR_ERR(drvdata->clk);
@@ -812,8 +836,9 @@ static int __devinit ux500_msp_drv_probe(struct platform_device *pdev)
 
 err_init_msp:
        clk_put(drvdata->clk);
-
 err_clk:
+       clk_put(drvdata->pclk);
+err_pclk:
        devm_regulator_put(drvdata->reg_vape);
 
        return ret;
@@ -829,6 +854,7 @@ static int __devexit ux500_msp_drv_remove(struct platform_device *pdev)
        prcmu_qos_remove_requirement(PRCMU_QOS_APE_OPP, "ux500_msp_i2s");
 
        clk_put(drvdata->clk);
+       clk_put(drvdata->pclk);
 
        ux500_msp_i2s_cleanup_msp(pdev, drvdata->msp);
 

diff --git a/sound/soc/ux500/ux500_msp_dai.h b/sound/soc/ux500/ux500_msp_dai.h
index 98202a3..9c778d9 100644 (file)
--- a/sound/soc/ux500/ux500_msp_dai.h
+++ b/sound/soc/ux500/ux500_msp_dai.h
@@ -69,6 +69,7 @@ struct ux500_msp_i2s_drvdata {
        /* Clocks */
        unsigned int master_clk;
        struct clk *clk;
+       struct clk *pclk;
 
        /* Regulators */
        int vape_opp_constraint;