Merge branch 'sh/pm-runtime' into sh-latest

Conflicts:
	arch/sh/kernel/cpu/sh4a/clock-sh7723.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --cc arch/sh/kernel/cpu/sh4a/clock-sh7723.c
index f254166e1f3b414ddfddd873015493487395337d,041c415e9c4e37d4b964e801a866ee36b5fec092..2f8c9179da47daaf267daac0324aad65b93a948d
--- 1/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
--- 2/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
@@@ -233,13 -236,51 +236,13 @@@ static struct clk_lookup lookups[] = 
        CLKDEV_CON_ID("sh0", &mstp_clks[HWBLK_SHYWAY]),
        CLKDEV_CON_ID("hudi0", &mstp_clks[HWBLK_HUDI]),
        CLKDEV_CON_ID("ubc0", &mstp_clks[HWBLK_UBC]),
 -      {
 -              /* TMU0 */
 -              .dev_id         = "sh_tmu.0",
 -              .con_id         = "tmu_fck",
 -              .clk            = &mstp_clks[HWBLK_TMU0],
 -      }, {
 -              /* TMU1 */
 -              .dev_id         = "sh_tmu.1",
 -              .con_id         = "tmu_fck",
 -              .clk            = &mstp_clks[HWBLK_TMU0],
 -      }, {
 -              /* TMU2 */
 -              .dev_id         = "sh_tmu.2",
 -              .con_id         = "tmu_fck",
 -              .clk            = &mstp_clks[HWBLK_TMU0],
 -      },
        CLKDEV_CON_ID("cmt_fck", &mstp_clks[HWBLK_CMT]),
-       CLKDEV_CON_ID("rwdt0", &mstp_clks[HWBLK_RWDT]),
-       CLKDEV_CON_ID("dmac1", &mstp_clks[HWBLK_DMAC1]),
+       CLKDEV_DEV_ID("sh-wdt.0", &mstp_clks[HWBLK_RWDT]),
+       CLKDEV_DEV_ID("sh-dma-engine.1", &mstp_clks[HWBLK_DMAC1]),
 -      {
 -              /* TMU3 */
 -              .dev_id         = "sh_tmu.3",
 -              .con_id         = "tmu_fck",
 -              .clk            = &mstp_clks[HWBLK_TMU1],
 -      }, {
 -              /* TMU4 */
 -              .dev_id         = "sh_tmu.4",
 -              .con_id         = "tmu_fck",
 -              .clk            = &mstp_clks[HWBLK_TMU1],
 -      }, {
 -              /* TMU5 */
 -              .dev_id         = "sh_tmu.5",
 -              .con_id         = "tmu_fck",
 -              .clk            = &mstp_clks[HWBLK_TMU1],
 -      },
        CLKDEV_CON_ID("flctl0", &mstp_clks[HWBLK_FLCTL]),
-       CLKDEV_CON_ID("msiof0", &mstp_clks[HWBLK_MSIOF0]),
-       CLKDEV_CON_ID("msiof1", &mstp_clks[HWBLK_MSIOF1]),
-       CLKDEV_CON_ID("meram0", &mstp_clks[HWBLK_MERAM]),
 -      CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[HWBLK_SCIF0]),
 -      CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[HWBLK_SCIF1]),
 -      CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[HWBLK_SCIF2]),
 -      CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[HWBLK_SCIF3]),
 -      CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[HWBLK_SCIF4]),
 -      CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[HWBLK_SCIF5]),
+       CLKDEV_DEV_ID("spi_sh_msiof.0", &mstp_clks[HWBLK_MSIOF0]),
+       CLKDEV_DEV_ID("spi_sh_msiof.1", &mstp_clks[HWBLK_MSIOF1]),
+       CLKDEV_DEV_ID("sh_mobile_meram.0", &mstp_clks[HWBLK_MERAM]),
        CLKDEV_DEV_ID("i2c-sh_mobile.0", &mstp_clks[HWBLK_IIC]),
        CLKDEV_CON_ID("rtc0", &mstp_clks[HWBLK_RTC]),
        CLKDEV_CON_ID("atapi0", &mstp_clks[HWBLK_ATAPI]),
@@@ -248,32 -289,19 +251,34 @@@
        CLKDEV_CON_ID("irda0", &mstp_clks[HWBLK_IRDA]),
        CLKDEV_CON_ID("tsif0", &mstp_clks[HWBLK_TSIF]),
        CLKDEV_CON_ID("icb0", &mstp_clks[HWBLK_ICB]),
-       CLKDEV_CON_ID("sdhi0", &mstp_clks[HWBLK_SDHI0]),
-       CLKDEV_CON_ID("sdhi1", &mstp_clks[HWBLK_SDHI1]),
-       CLKDEV_CON_ID("keysc0", &mstp_clks[HWBLK_KEYSC]),
+       CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[HWBLK_SDHI0]),
+       CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[HWBLK_SDHI1]),
+       CLKDEV_DEV_ID("sh_keysc.0", &mstp_clks[HWBLK_KEYSC]),
        CLKDEV_CON_ID("usb0", &mstp_clks[HWBLK_USB]),
        CLKDEV_CON_ID("2dg0", &mstp_clks[HWBLK_2DG]),
-       CLKDEV_CON_ID("siu0", &mstp_clks[HWBLK_SIU]),
+       CLKDEV_DEV_ID("siu-pcm-audio", &mstp_clks[HWBLK_SIU]),
        CLKDEV_CON_ID("veu1", &mstp_clks[HWBLK_VEU2H1]),
-       CLKDEV_CON_ID("vou0", &mstp_clks[HWBLK_VOU]),
+       CLKDEV_DEV_ID("sh-vou.0", &mstp_clks[HWBLK_VOU]),
        CLKDEV_CON_ID("beu0", &mstp_clks[HWBLK_BEU]),
-       CLKDEV_CON_ID("ceu0", &mstp_clks[HWBLK_CEU]),
+       CLKDEV_DEV_ID("sh_mobile_ceu.0", &mstp_clks[HWBLK_CEU]),
        CLKDEV_CON_ID("veu0", &mstp_clks[HWBLK_VEU2H0]),
        CLKDEV_CON_ID("vpu0", &mstp_clks[HWBLK_VPU]),
-       CLKDEV_CON_ID("lcdc0", &mstp_clks[HWBLK_LCDC]),
 +
 +      CLKDEV_ICK_ID("tmu_fck", "sh_tmu.0", &mstp_clks[HWBLK_TMU0]),
 +      CLKDEV_ICK_ID("tmu_fck", "sh_tmu.1", &mstp_clks[HWBLK_TMU0]),
 +      CLKDEV_ICK_ID("tmu_fck", "sh_tmu.2", &mstp_clks[HWBLK_TMU0]),
 +      CLKDEV_ICK_ID("tmu_fck", "sh_tmu.3", &mstp_clks[HWBLK_TMU1]),
 +      CLKDEV_ICK_ID("tmu_fck", "sh_tmu.4", &mstp_clks[HWBLK_TMU1]),
 +      CLKDEV_ICK_ID("tmu_fck", "sh_tmu.5", &mstp_clks[HWBLK_TMU1]),
++
 +      CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[HWBLK_SCIF0]),
 +      CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[HWBLK_SCIF1]),
 +      CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[HWBLK_SCIF2]),
 +      CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &mstp_clks[HWBLK_SCIF3]),
 +      CLKDEV_ICK_ID("sci_fck", "sh-sci.4", &mstp_clks[HWBLK_SCIF4]),
 +      CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &mstp_clks[HWBLK_SCIF5]),
++
+       CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[HWBLK_LCDC]),
  };
  
  int __init arch_clk_init(void)

diff --cc arch/sh/kernel/cpu/sh4a/clock-sh7724.c
index 9ee4b3667ddfe9218b657d5f94fc9a01ca04925b,8df1e4ae7492f61e3b289db0adccc7dfc3e80f0f..b3c039a5064a43756c5a0704f3073e223a091fba
--- 1/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
--- 2/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
@@@ -369,10 -359,13 +372,10 @@@ int __init arch_clk_init(void
                ret = sh_clk_div4_register(div4_clks, DIV4_NR, &div4_table);
  
        if (!ret)
 -              ret = sh_clk_div6_register(div6_clks, DIV6_NR);
 -
 -      if (!ret)
 -              ret = sh_clk_div6_reparent_register(div6_reparent_clks, DIV6_REPARENT_NR);
 +              ret = sh_clk_div6_reparent_register(div6_clks, DIV6_NR);
  
        if (!ret)
-               ret = sh_hwblk_clk_register(mstp_clks, HWBLK_NR);
+               ret = sh_clk_mstp32_register(mstp_clks, HWBLK_NR);
  
        return ret;
  }