Merge tag 'upstream-4.6-rc1' of git://git.infradead.org/linux-ubifs

[deliverable/linux.git] / drivers / clk / ux500 / u8500_of_clk.c

diff --git a/drivers/clk/ux500/u8500_of_clk.c b/drivers/clk/ux500/u8500_of_clk.c
index 271c09644652c72e3f057e8d90b2ebcb1d1f258c..9a736d939806e998c2cb42d674f6e8935dc9f35c 100644 (file)
--- a/drivers/clk/ux500/u8500_of_clk.c
+++ b/drivers/clk/ux500/u8500_of_clk.c
@@ -91,21 +91,21 @@ void u8500_clk_init(void)
 
        /* Clock sources */
        clk = clk_reg_prcmu_gate("soc0_pll", NULL, PRCMU_PLLSOC0,
-                               CLK_IS_ROOT|CLK_IGNORE_UNUSED);
+                               CLK_IGNORE_UNUSED);
        prcmu_clk[PRCMU_PLLSOC0] = clk;
 
        clk = clk_reg_prcmu_gate("soc1_pll", NULL, PRCMU_PLLSOC1,
-                               CLK_IS_ROOT|CLK_IGNORE_UNUSED);
+                               CLK_IGNORE_UNUSED);
        prcmu_clk[PRCMU_PLLSOC1] = clk;
 
        clk = clk_reg_prcmu_gate("ddr_pll", NULL, PRCMU_PLLDDR,
-                               CLK_IS_ROOT|CLK_IGNORE_UNUSED);
+                               CLK_IGNORE_UNUSED);
        prcmu_clk[PRCMU_PLLDDR] = clk;
 
        /* FIXME: Add sys, ulp and int clocks here. */
 
        rtc_clk = clk_register_fixed_rate(NULL, "rtc32k", "NULL",
-                               CLK_IS_ROOT|CLK_IGNORE_UNUSED,
+                               CLK_IGNORE_UNUSED,
                                32768);
 
        /* PRCMU clocks */
@@ -126,105 +126,101 @@ void u8500_clk_init(void)
                clk = clk_reg_prcmu_gate("sgclk", sgaclk_parent,
                                        PRCMU_SGACLK, 0);
        else
-               clk = clk_reg_prcmu_gate("sgclk", NULL,
-                                       PRCMU_SGACLK, CLK_IS_ROOT);
+               clk = clk_reg_prcmu_gate("sgclk", NULL, PRCMU_SGACLK, 0);
        prcmu_clk[PRCMU_SGACLK] = clk;
 
-       clk = clk_reg_prcmu_gate("uartclk", NULL, PRCMU_UARTCLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("uartclk", NULL, PRCMU_UARTCLK, 0);
        prcmu_clk[PRCMU_UARTCLK] = clk;
 
-       clk = clk_reg_prcmu_gate("msp02clk", NULL, PRCMU_MSP02CLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("msp02clk", NULL, PRCMU_MSP02CLK, 0);
        prcmu_clk[PRCMU_MSP02CLK] = clk;
 
-       clk = clk_reg_prcmu_gate("msp1clk", NULL, PRCMU_MSP1CLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("msp1clk", NULL, PRCMU_MSP1CLK, 0);
        prcmu_clk[PRCMU_MSP1CLK] = clk;
 
-       clk = clk_reg_prcmu_gate("i2cclk", NULL, PRCMU_I2CCLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("i2cclk", NULL, PRCMU_I2CCLK, 0);
        prcmu_clk[PRCMU_I2CCLK] = clk;
 
-       clk = clk_reg_prcmu_gate("slimclk", NULL, PRCMU_SLIMCLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("slimclk", NULL, PRCMU_SLIMCLK, 0);
        prcmu_clk[PRCMU_SLIMCLK] = clk;
 
-       clk = clk_reg_prcmu_gate("per1clk", NULL, PRCMU_PER1CLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("per1clk", NULL, PRCMU_PER1CLK, 0);
        prcmu_clk[PRCMU_PER1CLK] = clk;
 
-       clk = clk_reg_prcmu_gate("per2clk", NULL, PRCMU_PER2CLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("per2clk", NULL, PRCMU_PER2CLK, 0);
        prcmu_clk[PRCMU_PER2CLK] = clk;
 
-       clk = clk_reg_prcmu_gate("per3clk", NULL, PRCMU_PER3CLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("per3clk", NULL, PRCMU_PER3CLK, 0);
        prcmu_clk[PRCMU_PER3CLK] = clk;
 
-       clk = clk_reg_prcmu_gate("per5clk", NULL, PRCMU_PER5CLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("per5clk", NULL, PRCMU_PER5CLK, 0);
        prcmu_clk[PRCMU_PER5CLK] = clk;
 
-       clk = clk_reg_prcmu_gate("per6clk", NULL, PRCMU_PER6CLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("per6clk", NULL, PRCMU_PER6CLK, 0);
        prcmu_clk[PRCMU_PER6CLK] = clk;
 
-       clk = clk_reg_prcmu_gate("per7clk", NULL, PRCMU_PER7CLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("per7clk", NULL, PRCMU_PER7CLK, 0);
        prcmu_clk[PRCMU_PER7CLK] = clk;
 
        clk = clk_reg_prcmu_scalable("lcdclk", NULL, PRCMU_LCDCLK, 0,
-                               CLK_IS_ROOT|CLK_SET_RATE_GATE);
+                               CLK_SET_RATE_GATE);
        prcmu_clk[PRCMU_LCDCLK] = clk;
 
-       clk = clk_reg_prcmu_opp_gate("bmlclk", NULL, PRCMU_BMLCLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_opp_gate("bmlclk", NULL, PRCMU_BMLCLK, 0);
        prcmu_clk[PRCMU_BMLCLK] = clk;
 
        clk = clk_reg_prcmu_scalable("hsitxclk", NULL, PRCMU_HSITXCLK, 0,
-                               CLK_IS_ROOT|CLK_SET_RATE_GATE);
+                               CLK_SET_RATE_GATE);
        prcmu_clk[PRCMU_HSITXCLK] = clk;
 
        clk = clk_reg_prcmu_scalable("hsirxclk", NULL, PRCMU_HSIRXCLK, 0,
-                               CLK_IS_ROOT|CLK_SET_RATE_GATE);
+                               CLK_SET_RATE_GATE);
        prcmu_clk[PRCMU_HSIRXCLK] = clk;
 
        clk = clk_reg_prcmu_scalable("hdmiclk", NULL, PRCMU_HDMICLK, 0,
-                               CLK_IS_ROOT|CLK_SET_RATE_GATE);
+                               CLK_SET_RATE_GATE);
        prcmu_clk[PRCMU_HDMICLK] = clk;
 
-       clk = clk_reg_prcmu_gate("apeatclk", NULL, PRCMU_APEATCLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("apeatclk", NULL, PRCMU_APEATCLK, 0);
        prcmu_clk[PRCMU_APEATCLK] = clk;
 
        clk = clk_reg_prcmu_scalable("apetraceclk", NULL, PRCMU_APETRACECLK, 0,
-                               CLK_IS_ROOT|CLK_SET_RATE_GATE);
+                               CLK_SET_RATE_GATE);
        prcmu_clk[PRCMU_APETRACECLK] = clk;
 
-       clk = clk_reg_prcmu_gate("mcdeclk", NULL, PRCMU_MCDECLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("mcdeclk", NULL, PRCMU_MCDECLK, 0);
        prcmu_clk[PRCMU_MCDECLK] = clk;
 
-       clk = clk_reg_prcmu_opp_gate("ipi2cclk", NULL, PRCMU_IPI2CCLK,
-                               CLK_IS_ROOT);
+       clk = clk_reg_prcmu_opp_gate("ipi2cclk", NULL, PRCMU_IPI2CCLK, 0);
        prcmu_clk[PRCMU_IPI2CCLK] = clk;
 
-       clk = clk_reg_prcmu_gate("dsialtclk", NULL, PRCMU_DSIALTCLK,
-                               CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("dsialtclk", NULL, PRCMU_DSIALTCLK, 0);
        prcmu_clk[PRCMU_DSIALTCLK] = clk;
 
-       clk = clk_reg_prcmu_gate("dmaclk", NULL, PRCMU_DMACLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("dmaclk", NULL, PRCMU_DMACLK, 0);
        prcmu_clk[PRCMU_DMACLK] = clk;
 
-       clk = clk_reg_prcmu_gate("b2r2clk", NULL, PRCMU_B2R2CLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("b2r2clk", NULL, PRCMU_B2R2CLK, 0);
        prcmu_clk[PRCMU_B2R2CLK] = clk;
 
        clk = clk_reg_prcmu_scalable("tvclk", NULL, PRCMU_TVCLK, 0,
-                               CLK_IS_ROOT|CLK_SET_RATE_GATE);
+                               CLK_SET_RATE_GATE);
        prcmu_clk[PRCMU_TVCLK] = clk;
 
-       clk = clk_reg_prcmu_gate("sspclk", NULL, PRCMU_SSPCLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("sspclk", NULL, PRCMU_SSPCLK, 0);
        prcmu_clk[PRCMU_SSPCLK] = clk;
 
-       clk = clk_reg_prcmu_gate("rngclk", NULL, PRCMU_RNGCLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("rngclk", NULL, PRCMU_RNGCLK, 0);
        prcmu_clk[PRCMU_RNGCLK] = clk;
 
-       clk = clk_reg_prcmu_gate("uiccclk", NULL, PRCMU_UICCCLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("uiccclk", NULL, PRCMU_UICCCLK, 0);
        prcmu_clk[PRCMU_UICCCLK] = clk;
 
-       clk = clk_reg_prcmu_gate("timclk", NULL, PRCMU_TIMCLK, CLK_IS_ROOT);
+       clk = clk_reg_prcmu_gate("timclk", NULL, PRCMU_TIMCLK, 0);
        prcmu_clk[PRCMU_TIMCLK] = clk;
 
        clk = clk_reg_prcmu_opp_volt_scalable("sdmmcclk", NULL, PRCMU_SDMMCCLK,
-                                       100000000,
-                                       CLK_IS_ROOT|CLK_SET_RATE_GATE);
+                                       100000000, CLK_SET_RATE_GATE);
        prcmu_clk[PRCMU_SDMMCCLK] = clk;
 
        clk = clk_reg_prcmu_scalable("dsi_pll", "hdmiclk",
@@ -252,7 +248,7 @@ void u8500_clk_init(void)
        prcmu_clk[PRCMU_DSI2ESCCLK] = clk;
 
        clk = clk_reg_prcmu_scalable_rate("armss", NULL,
-                               PRCMU_ARMSS, 0, CLK_IS_ROOT|CLK_IGNORE_UNUSED);
+                               PRCMU_ARMSS, 0, CLK_IGNORE_UNUSED);
        prcmu_clk[PRCMU_ARMSS] = clk;
 
        twd_clk = clk_register_fixed_factor(NULL, "smp_twd", "armss",