Merge remote-tracking branch 'agust/next' into next

<<
Switch mpc512x to the common clock framework and adapt mpc512x
drivers to use the new clock driver. Old PPC_CLOCK code is
removed entirely since there are no users any more.
>>

1 files changed, 18 insertions, 8 deletions

diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index 46d2313f7c6f..5032141eeeec 100644
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -40,6 +40,7 @@ struct mpc512x_psc_spi {
         unsigned int irq;
         u8 bits_per_word;
         struct clk *clk_mclk;
+        struct clk *clk_ipg;
         u32 mclk_rate;
 
         struct completion txisrdone;
@@ -475,8 +476,6 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
         struct spi_master *master;
         int ret;
         void *tempp;
-        int psc_num;
-        char clk_name[16];
         struct clk *clk;
 
         master = spi_alloc_master(dev, sizeof *mps);
@@ -519,9 +518,7 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
                 goto free_master;
         init_completion(&mps->txisrdone);
 
-        psc_num = master->bus_num;
-        snprintf(clk_name, sizeof(clk_name), "psc%d_mclk", psc_num);
-        clk = devm_clk_get(dev, clk_name);
+        clk = devm_clk_get(dev, "mclk");
         if (IS_ERR(clk)) {
                 ret = PTR_ERR(clk);
                 goto free_master;
@@ -532,17 +529,29 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
         mps->clk_mclk = clk;
         mps->mclk_rate = clk_get_rate(clk);
 
+        clk = devm_clk_get(dev, "ipg");
+        if (IS_ERR(clk)) {
+                ret = PTR_ERR(clk);
+                goto free_mclk_clock;
+        }
+        ret = clk_prepare_enable(clk);
+        if (ret)
+                goto free_mclk_clock;
+        mps->clk_ipg = clk;
+
         ret = mpc512x_psc_spi_port_config(master, mps);
         if (ret < 0)
-                goto free_clock;
+                goto free_ipg_clock;
 
         ret = devm_spi_register_master(dev, master);
         if (ret < 0)
-                goto free_clock;
+                goto free_ipg_clock;
 
         return ret;
 
-free_clock:
+free_ipg_clock:
+        clk_disable_unprepare(mps->clk_ipg);
+free_mclk_clock:
         clk_disable_unprepare(mps->clk_mclk);
 free_master:
         spi_master_put(master);
@@ -556,6 +565,7 @@ static int mpc512x_psc_spi_do_remove(struct device *dev)
         struct mpc512x_psc_spi *mps = spi_master_get_devdata(master);
 
         clk_disable_unprepare(mps->clk_mclk);
+        clk_disable_unprepare(mps->clk_ipg);
 
         return 0;
 }