diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2016-03-01 14:00:10 -0500 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-04-15 19:50:09 -0400 |
commit | 26659ada14cece0d0705f4e020dab634db2f95cc (patch) | |
tree | e73bb1f2462dd1f2a969fa86a84825cfe59efb16 | |
parent | c9bb8a4f3db60342ad97f7eb77965a6ae30851bb (diff) |
clk: clps711x: Remove CLK_IS_ROOT
This flag is a no-op now. Remove usage of the flag.
Cc: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-rw-r--r-- | drivers/clk/clk-clps711x.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/clk/clk-clps711x.c b/drivers/clk/clk-clps711x.c index ff4ef4f1df62..1f60b02416a7 100644 --- a/drivers/clk/clk-clps711x.c +++ b/drivers/clk/clk-clps711x.c | |||
@@ -107,16 +107,15 @@ static struct clps711x_clk * __init _clps711x_clk_init(void __iomem *base, | |||
107 | writel(tmp, base + CLPS711X_SYSCON1); | 107 | writel(tmp, base + CLPS711X_SYSCON1); |
108 | 108 | ||
109 | clps711x_clk->clks[CLPS711X_CLK_DUMMY] = | 109 | clps711x_clk->clks[CLPS711X_CLK_DUMMY] = |
110 | clk_register_fixed_rate(NULL, "dummy", NULL, CLK_IS_ROOT, 0); | 110 | clk_register_fixed_rate(NULL, "dummy", NULL, 0, 0); |
111 | clps711x_clk->clks[CLPS711X_CLK_CPU] = | 111 | clps711x_clk->clks[CLPS711X_CLK_CPU] = |
112 | clk_register_fixed_rate(NULL, "cpu", NULL, CLK_IS_ROOT, f_cpu); | 112 | clk_register_fixed_rate(NULL, "cpu", NULL, 0, f_cpu); |
113 | clps711x_clk->clks[CLPS711X_CLK_BUS] = | 113 | clps711x_clk->clks[CLPS711X_CLK_BUS] = |
114 | clk_register_fixed_rate(NULL, "bus", NULL, CLK_IS_ROOT, f_bus); | 114 | clk_register_fixed_rate(NULL, "bus", NULL, 0, f_bus); |
115 | clps711x_clk->clks[CLPS711X_CLK_PLL] = | 115 | clps711x_clk->clks[CLPS711X_CLK_PLL] = |
116 | clk_register_fixed_rate(NULL, "pll", NULL, CLK_IS_ROOT, f_pll); | 116 | clk_register_fixed_rate(NULL, "pll", NULL, 0, f_pll); |
117 | clps711x_clk->clks[CLPS711X_CLK_TIMERREF] = | 117 | clps711x_clk->clks[CLPS711X_CLK_TIMERREF] = |
118 | clk_register_fixed_rate(NULL, "timer_ref", NULL, CLK_IS_ROOT, | 118 | clk_register_fixed_rate(NULL, "timer_ref", NULL, 0, f_tim); |
119 | f_tim); | ||
120 | clps711x_clk->clks[CLPS711X_CLK_TIMER1] = | 119 | clps711x_clk->clks[CLPS711X_CLK_TIMER1] = |
121 | clk_register_divider_table(NULL, "timer1", "timer_ref", 0, | 120 | clk_register_divider_table(NULL, "timer1", "timer_ref", 0, |
122 | base + CLPS711X_SYSCON1, 5, 1, 0, | 121 | base + CLPS711X_SYSCON1, 5, 1, 0, |
@@ -126,10 +125,9 @@ static struct clps711x_clk * __init _clps711x_clk_init(void __iomem *base, | |||
126 | base + CLPS711X_SYSCON1, 7, 1, 0, | 125 | base + CLPS711X_SYSCON1, 7, 1, 0, |
127 | timer_div_table, &clps711x_clk->lock); | 126 | timer_div_table, &clps711x_clk->lock); |
128 | clps711x_clk->clks[CLPS711X_CLK_PWM] = | 127 | clps711x_clk->clks[CLPS711X_CLK_PWM] = |
129 | clk_register_fixed_rate(NULL, "pwm", NULL, CLK_IS_ROOT, f_pwm); | 128 | clk_register_fixed_rate(NULL, "pwm", NULL, 0, f_pwm); |
130 | clps711x_clk->clks[CLPS711X_CLK_SPIREF] = | 129 | clps711x_clk->clks[CLPS711X_CLK_SPIREF] = |
131 | clk_register_fixed_rate(NULL, "spi_ref", NULL, CLK_IS_ROOT, | 130 | clk_register_fixed_rate(NULL, "spi_ref", NULL, 0, f_spi); |
132 | f_spi); | ||
133 | clps711x_clk->clks[CLPS711X_CLK_SPI] = | 131 | clps711x_clk->clks[CLPS711X_CLK_SPI] = |
134 | clk_register_divider_table(NULL, "spi", "spi_ref", 0, | 132 | clk_register_divider_table(NULL, "spi", "spi_ref", 0, |
135 | base + CLPS711X_SYSCON1, 16, 2, 0, | 133 | base + CLPS711X_SYSCON1, 16, 2, 0, |
@@ -137,8 +135,7 @@ static struct clps711x_clk * __init _clps711x_clk_init(void __iomem *base, | |||
137 | clps711x_clk->clks[CLPS711X_CLK_UART] = | 135 | clps711x_clk->clks[CLPS711X_CLK_UART] = |
138 | clk_register_fixed_factor(NULL, "uart", "bus", 0, 1, 10); | 136 | clk_register_fixed_factor(NULL, "uart", "bus", 0, 1, 10); |
139 | clps711x_clk->clks[CLPS711X_CLK_TICK] = | 137 | clps711x_clk->clks[CLPS711X_CLK_TICK] = |
140 | clk_register_fixed_rate(NULL, "tick", NULL, CLK_IS_ROOT, 64); | 138 | clk_register_fixed_rate(NULL, "tick", NULL, 0, 64); |
141 | |||
142 | for (i = 0; i < CLPS711X_CLK_MAX; i++) | 139 | for (i = 0; i < CLPS711X_CLK_MAX; i++) |
143 | if (IS_ERR(clps711x_clk->clks[i])) | 140 | if (IS_ERR(clps711x_clk->clks[i])) |
144 | pr_err("clk %i: register failed with %ld\n", | 141 | pr_err("clk %i: register failed with %ld\n", |