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.
>>

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc drivers/net/can/mscan/mpc5xxx_can.c
Simple merge

diff --cc drivers/spi/spi-mpc512x-psc.c
index 46d2313,de66c67..5032141
--- 1/drivers/spi/spi-mpc512x-psc.c
--- 2/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@@ -519,12 -519,10 +518,10 @@@ static int mpc512x_psc_spi_do_probe(str
                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_irq;
 +              goto free_master;
        }
        ret = clk_prepare_enable(clk);
        if (ret)
@@@ -542,9 -550,15 +549,11 @@@
  
        return ret;
  
- free_clock:
+ free_ipg_clock:
+       clk_disable_unprepare(mps->clk_ipg);
+ free_mclk_clock:
        clk_disable_unprepare(mps->clk_mclk);
 -free_irq:
 -      free_irq(mps->irq, mps);
  free_master:
 -      if (mps->psc)
 -              iounmap(mps->psc);
        spi_master_put(master);
  
        return ret;
@@@ -556,6 -570,10 +565,7 @@@ static int mpc512x_psc_spi_do_remove(st
        struct mpc512x_psc_spi *mps = spi_master_get_devdata(master);
  
        clk_disable_unprepare(mps->clk_mclk);
 -      free_irq(mps->irq, mps);
 -      if (mps->psc)
 -              iounmap(mps->psc);
+       clk_disable_unprepare(mps->clk_ipg);
  
        return 0;
  }

diff --cc include/linux/clk-provider.h
Simple merge