Merge branch 'sh/pm-runtime' into sh-latest
[~shefty/rdma-dev.git] / arch / sh / kernel / cpu / sh4a / clock-sh7724.c
index 9ee4b3667ddfe9218b657d5f94fc9a01ca04925b..b3c039a5064a43756c5a0704f3073e223a091fba 100644 (file)
@@ -23,8 +23,8 @@
 #include <linux/io.h>
 #include <linux/clk.h>
 #include <linux/clkdev.h>
+#include <linux/sh_clk.h>
 #include <asm/clock.h>
-#include <asm/hwblk.h>
 #include <cpu/sh7724.h>
 
 /* SH7724 registers */
@@ -35,6 +35,9 @@
 #define FCLKBCR                0xa415000c
 #define IRDACLKCR      0xa4150018
 #define PLLCR          0xa4150024
+#define MSTPCR0                0xa4150030
+#define MSTPCR1                0xa4150034
+#define MSTPCR2                0xa4150038
 #define SPUCLKCR       0xa415003c
 #define FLLFRQ         0xa4150050
 #define LSTATS         0xa4150060
@@ -209,60 +212,60 @@ static struct clk div6_clks[DIV6_NR] = {
 };
 
 static struct clk mstp_clks[HWBLK_NR] = {
-       SH_HWBLK_CLK(HWBLK_TLB, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),
-       SH_HWBLK_CLK(HWBLK_IC, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),
-       SH_HWBLK_CLK(HWBLK_OC, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),
-       SH_HWBLK_CLK(HWBLK_RSMEM, &div4_clks[DIV4_B], CLK_ENABLE_ON_INIT),
-       SH_HWBLK_CLK(HWBLK_ILMEM, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),
-       SH_HWBLK_CLK(HWBLK_L2C, &div4_clks[DIV4_SH], CLK_ENABLE_ON_INIT),
-       SH_HWBLK_CLK(HWBLK_FPU, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),
-       SH_HWBLK_CLK(HWBLK_INTC, &div4_clks[DIV4_P], CLK_ENABLE_ON_INIT),
-       SH_HWBLK_CLK(HWBLK_DMAC0, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_SHYWAY, &div4_clks[DIV4_SH], CLK_ENABLE_ON_INIT),
-       SH_HWBLK_CLK(HWBLK_HUDI, &div4_clks[DIV4_P], 0),
-       SH_HWBLK_CLK(HWBLK_UBC, &div4_clks[DIV4_I], 0),
-       SH_HWBLK_CLK(HWBLK_TMU0, &div4_clks[DIV4_P], 0),
-       SH_HWBLK_CLK(HWBLK_CMT, &r_clk, 0),
-       SH_HWBLK_CLK(HWBLK_RWDT, &r_clk, 0),
-       SH_HWBLK_CLK(HWBLK_DMAC1, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_TMU1, &div4_clks[DIV4_P], 0),
-       SH_HWBLK_CLK(HWBLK_SCIF0, &div4_clks[DIV4_P], 0),
-       SH_HWBLK_CLK(HWBLK_SCIF1, &div4_clks[DIV4_P], 0),
-       SH_HWBLK_CLK(HWBLK_SCIF2, &div4_clks[DIV4_P], 0),
-       SH_HWBLK_CLK(HWBLK_SCIF3, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_SCIF4, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_SCIF5, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_MSIOF0, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_MSIOF1, &div4_clks[DIV4_B], 0),
-
-       SH_HWBLK_CLK(HWBLK_KEYSC, &r_clk, 0),
-       SH_HWBLK_CLK(HWBLK_RTC, &r_clk, 0),
-       SH_HWBLK_CLK(HWBLK_IIC0, &div4_clks[DIV4_P], 0),
-       SH_HWBLK_CLK(HWBLK_IIC1, &div4_clks[DIV4_P], 0),
-
-       SH_HWBLK_CLK(HWBLK_MMC, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_ETHER, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_ATAPI, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_TPU, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_IRDA, &div4_clks[DIV4_P], 0),
-       SH_HWBLK_CLK(HWBLK_TSIF, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_USB1, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_USB0, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_2DG, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_SDHI0, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_SDHI1, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_VEU1, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_CEU1, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_BEU1, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_2DDMAC, &div4_clks[DIV4_SH], 0),
-       SH_HWBLK_CLK(HWBLK_SPU, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_JPU, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_VOU, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_BEU0, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_CEU0, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_VEU0, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_VPU, &div4_clks[DIV4_B], 0),
-       SH_HWBLK_CLK(HWBLK_LCDC, &div4_clks[DIV4_B], 0),
+       [HWBLK_TLB] = SH_CLK_MSTP32(&div4_clks[DIV4_I],     MSTPCR0, 31, CLK_ENABLE_ON_INIT),
+       [HWBLK_IC] = SH_CLK_MSTP32(&div4_clks[DIV4_I],      MSTPCR0, 30, CLK_ENABLE_ON_INIT),
+       [HWBLK_OC] = SH_CLK_MSTP32(&div4_clks[DIV4_I],      MSTPCR0, 29, CLK_ENABLE_ON_INIT),
+       [HWBLK_RSMEM] = SH_CLK_MSTP32(&div4_clks[DIV4_B],   MSTPCR0, 28, CLK_ENABLE_ON_INIT),
+       [HWBLK_ILMEM] = SH_CLK_MSTP32(&div4_clks[DIV4_I],   MSTPCR0, 27, CLK_ENABLE_ON_INIT),
+       [HWBLK_L2C] = SH_CLK_MSTP32(&div4_clks[DIV4_SH],    MSTPCR0, 26, CLK_ENABLE_ON_INIT),
+       [HWBLK_FPU] = SH_CLK_MSTP32(&div4_clks[DIV4_I],     MSTPCR0, 24, CLK_ENABLE_ON_INIT),
+       [HWBLK_INTC] = SH_CLK_MSTP32(&div4_clks[DIV4_P],    MSTPCR0, 22, CLK_ENABLE_ON_INIT),
+       [HWBLK_DMAC0] = SH_CLK_MSTP32(&div4_clks[DIV4_B],   MSTPCR0, 21, 0),
+       [HWBLK_SHYWAY] = SH_CLK_MSTP32(&div4_clks[DIV4_SH], MSTPCR0, 20, CLK_ENABLE_ON_INIT),
+       [HWBLK_HUDI] = SH_CLK_MSTP32(&div4_clks[DIV4_P],    MSTPCR0, 19, 0),
+       [HWBLK_UBC] = SH_CLK_MSTP32(&div4_clks[DIV4_I],     MSTPCR0, 17, 0),
+       [HWBLK_TMU0] = SH_CLK_MSTP32(&div4_clks[DIV4_P],    MSTPCR0, 15, 0),
+       [HWBLK_CMT] = SH_CLK_MSTP32(&r_clk,                 MSTPCR0, 14, 0),
+       [HWBLK_RWDT] = SH_CLK_MSTP32(&r_clk,                MSTPCR0, 13, 0),
+       [HWBLK_DMAC1] = SH_CLK_MSTP32(&div4_clks[DIV4_B],   MSTPCR0, 12, 0),
+       [HWBLK_TMU1] = SH_CLK_MSTP32(&div4_clks[DIV4_P],    MSTPCR0, 10, 0),
+       [HWBLK_SCIF0] = SH_CLK_MSTP32(&div4_clks[DIV4_P],   MSTPCR0, 9, 0),
+       [HWBLK_SCIF1] = SH_CLK_MSTP32(&div4_clks[DIV4_P],   MSTPCR0, 8, 0),
+       [HWBLK_SCIF2] = SH_CLK_MSTP32(&div4_clks[DIV4_P],   MSTPCR0, 7, 0),
+       [HWBLK_SCIF3] = SH_CLK_MSTP32(&div4_clks[DIV4_B],   MSTPCR0, 6, 0),
+       [HWBLK_SCIF4] = SH_CLK_MSTP32(&div4_clks[DIV4_B],   MSTPCR0, 5, 0),
+       [HWBLK_SCIF5] = SH_CLK_MSTP32(&div4_clks[DIV4_B],   MSTPCR0, 4, 0),
+       [HWBLK_MSIOF0] = SH_CLK_MSTP32(&div4_clks[DIV4_B],  MSTPCR0, 2, 0),
+       [HWBLK_MSIOF1] = SH_CLK_MSTP32(&div4_clks[DIV4_B],  MSTPCR0, 1, 0),
+
+       [HWBLK_KEYSC] = SH_CLK_MSTP32(&r_clk,               MSTPCR1, 12, 0),
+       [HWBLK_RTC] = SH_CLK_MSTP32(&r_clk,                 MSTPCR1, 11, 0),
+       [HWBLK_IIC0] = SH_CLK_MSTP32(&div4_clks[DIV4_P],    MSTPCR1, 9, 0),
+       [HWBLK_IIC1] = SH_CLK_MSTP32(&div4_clks[DIV4_P],    MSTPCR1, 8, 0),
+
+       [HWBLK_MMC] = SH_CLK_MSTP32(&div4_clks[DIV4_B],     MSTPCR2, 29, 0),
+       [HWBLK_ETHER] = SH_CLK_MSTP32(&div4_clks[DIV4_B],   MSTPCR2, 28, 0),
+       [HWBLK_ATAPI] = SH_CLK_MSTP32(&div4_clks[DIV4_B],   MSTPCR2, 26, 0),
+       [HWBLK_TPU] = SH_CLK_MSTP32(&div4_clks[DIV4_B],     MSTPCR2, 25, 0),
+       [HWBLK_IRDA] = SH_CLK_MSTP32(&div4_clks[DIV4_P],    MSTPCR2, 24, 0),
+       [HWBLK_TSIF] = SH_CLK_MSTP32(&div4_clks[DIV4_B],    MSTPCR2, 22, 0),
+       [HWBLK_USB1] = SH_CLK_MSTP32(&div4_clks[DIV4_B],    MSTPCR2, 21, 0),
+       [HWBLK_USB0] = SH_CLK_MSTP32(&div4_clks[DIV4_B],    MSTPCR2, 20, 0),
+       [HWBLK_2DG] = SH_CLK_MSTP32(&div4_clks[DIV4_B],     MSTPCR2, 19, 0),
+       [HWBLK_SDHI0] = SH_CLK_MSTP32(&div4_clks[DIV4_B],   MSTPCR2, 18, 0),
+       [HWBLK_SDHI1] = SH_CLK_MSTP32(&div4_clks[DIV4_B],   MSTPCR2, 17, 0),
+       [HWBLK_VEU1] = SH_CLK_MSTP32(&div4_clks[DIV4_B],    MSTPCR2, 15, 0),
+       [HWBLK_CEU1] = SH_CLK_MSTP32(&div4_clks[DIV4_B],    MSTPCR2, 13, 0),
+       [HWBLK_BEU1] = SH_CLK_MSTP32(&div4_clks[DIV4_B],    MSTPCR2, 12, 0),
+       [HWBLK_2DDMAC] = SH_CLK_MSTP32(&div4_clks[DIV4_SH], MSTPCR2, 10, 0),
+       [HWBLK_SPU] = SH_CLK_MSTP32(&div4_clks[DIV4_B],     MSTPCR2, 9, 0),
+       [HWBLK_JPU] = SH_CLK_MSTP32(&div4_clks[DIV4_B],     MSTPCR2, 6, 0),
+       [HWBLK_VOU] = SH_CLK_MSTP32(&div4_clks[DIV4_B],     MSTPCR2, 5, 0),
+       [HWBLK_BEU0] = SH_CLK_MSTP32(&div4_clks[DIV4_B],    MSTPCR2, 4, 0),
+       [HWBLK_CEU0] = SH_CLK_MSTP32(&div4_clks[DIV4_B],    MSTPCR2, 3, 0),
+       [HWBLK_VEU0] = SH_CLK_MSTP32(&div4_clks[DIV4_B],    MSTPCR2, 2, 0),
+       [HWBLK_VPU] = SH_CLK_MSTP32(&div4_clks[DIV4_B],     MSTPCR2, 1, 0),
+       [HWBLK_LCDC] = SH_CLK_MSTP32(&div4_clks[DIV4_B],    MSTPCR2, 0, 0),
 };
 
 static struct clk_lookup lookups[] = {
@@ -296,7 +299,7 @@ static struct clk_lookup lookups[] = {
        CLKDEV_CON_ID("l2c0", &mstp_clks[HWBLK_L2C]),
        CLKDEV_CON_ID("fpu0", &mstp_clks[HWBLK_FPU]),
        CLKDEV_CON_ID("intc0", &mstp_clks[HWBLK_INTC]),
-       CLKDEV_CON_ID("dmac0", &mstp_clks[HWBLK_DMAC0]),
+       CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[HWBLK_DMAC0]),
        CLKDEV_CON_ID("sh0", &mstp_clks[HWBLK_SHYWAY]),
        CLKDEV_CON_ID("hudi0", &mstp_clks[HWBLK_HUDI]),
        CLKDEV_CON_ID("ubc0", &mstp_clks[HWBLK_UBC]),
@@ -307,26 +310,26 @@ static struct clk_lookup lookups[] = {
        CLKDEV_ICK_ID("tmu_fck", "sh_tmu.3", &mstp_clks[HWBLK_TMU1]),
 
        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]),
 
        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_CON_ID("msiof0", &mstp_clks[HWBLK_MSIOF0]),
-       CLKDEV_CON_ID("msiof1", &mstp_clks[HWBLK_MSIOF1]),
-       CLKDEV_CON_ID("keysc0", &mstp_clks[HWBLK_KEYSC]),
+       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_keysc.0", &mstp_clks[HWBLK_KEYSC]),
        CLKDEV_CON_ID("rtc0", &mstp_clks[HWBLK_RTC]),
        CLKDEV_DEV_ID("i2c-sh_mobile.0", &mstp_clks[HWBLK_IIC0]),
        CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[HWBLK_IIC1]),
-       CLKDEV_CON_ID("mmc0", &mstp_clks[HWBLK_MMC]),
-       CLKDEV_CON_ID("eth0", &mstp_clks[HWBLK_ETHER]),
+       CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[HWBLK_MMC]),
+       CLKDEV_DEV_ID("sh-eth.0", &mstp_clks[HWBLK_ETHER]),
        CLKDEV_CON_ID("atapi0", &mstp_clks[HWBLK_ATAPI]),
        CLKDEV_CON_ID("tpu0", &mstp_clks[HWBLK_TPU]),
        CLKDEV_CON_ID("irda0", &mstp_clks[HWBLK_IRDA]),
@@ -334,20 +337,20 @@ static struct clk_lookup lookups[] = {
        CLKDEV_CON_ID("usb1", &mstp_clks[HWBLK_USB1]),
        CLKDEV_CON_ID("usb0", &mstp_clks[HWBLK_USB0]),
        CLKDEV_CON_ID("2dg0", &mstp_clks[HWBLK_2DG]),
-       CLKDEV_CON_ID("sdhi0", &mstp_clks[HWBLK_SDHI0]),
-       CLKDEV_CON_ID("sdhi1", &mstp_clks[HWBLK_SDHI1]),
+       CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[HWBLK_SDHI0]),
+       CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[HWBLK_SDHI1]),
        CLKDEV_CON_ID("veu1", &mstp_clks[HWBLK_VEU1]),
-       CLKDEV_CON_ID("ceu1", &mstp_clks[HWBLK_CEU1]),
+       CLKDEV_DEV_ID("sh_mobile_ceu.1", &mstp_clks[HWBLK_CEU1]),
        CLKDEV_CON_ID("beu1", &mstp_clks[HWBLK_BEU1]),
        CLKDEV_CON_ID("2ddmac0", &mstp_clks[HWBLK_2DDMAC]),
        CLKDEV_CON_ID("spu0", &mstp_clks[HWBLK_SPU]),
        CLKDEV_CON_ID("jpu0", &mstp_clks[HWBLK_JPU]),
-       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_BEU0]),
-       CLKDEV_CON_ID("ceu0", &mstp_clks[HWBLK_CEU0]),
+       CLKDEV_DEV_ID("sh_mobile_ceu.0", &mstp_clks[HWBLK_CEU0]),
        CLKDEV_CON_ID("veu0", &mstp_clks[HWBLK_VEU0]),
        CLKDEV_CON_ID("vpu0", &mstp_clks[HWBLK_VPU]),
-       CLKDEV_CON_ID("lcdc0", &mstp_clks[HWBLK_LCDC]),
+       CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[HWBLK_LCDC]),
 };
 
 int __init arch_clk_init(void)
@@ -372,7 +375,7 @@ int __init arch_clk_init(void)
                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;
 }