Skip to content

Commit 801179b

Browse files
Linus Walleijbebarino
authored andcommitted
clk: ux500: Drop .is_enabled state from PRCMU clocks
The core already keeps a software enable count. Drop this custom software enable count. Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20220414221751.323525-3-linus.walleij@linaro.org Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 7335631 commit 801179b

1 file changed

Lines changed: 0 additions & 35 deletions

File tree

drivers/clk/ux500/clk-prcmu.c

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ struct clk_prcmu {
1919
struct clk_hw hw;
2020
u8 cg_sel;
2121
int is_prepared;
22-
int is_enabled;
2322
int opp_requested;
2423
};
2524

@@ -53,25 +52,6 @@ static int clk_prcmu_is_prepared(struct clk_hw *hw)
5352
return clk->is_prepared;
5453
}
5554

56-
static int clk_prcmu_enable(struct clk_hw *hw)
57-
{
58-
struct clk_prcmu *clk = to_clk_prcmu(hw);
59-
clk->is_enabled = 1;
60-
return 0;
61-
}
62-
63-
static void clk_prcmu_disable(struct clk_hw *hw)
64-
{
65-
struct clk_prcmu *clk = to_clk_prcmu(hw);
66-
clk->is_enabled = 0;
67-
}
68-
69-
static int clk_prcmu_is_enabled(struct clk_hw *hw)
70-
{
71-
struct clk_prcmu *clk = to_clk_prcmu(hw);
72-
return clk->is_enabled;
73-
}
74-
7555
static unsigned long clk_prcmu_recalc_rate(struct clk_hw *hw,
7656
unsigned long parent_rate)
7757
{
@@ -189,9 +169,6 @@ static const struct clk_ops clk_prcmu_scalable_ops = {
189169
.prepare = clk_prcmu_prepare,
190170
.unprepare = clk_prcmu_unprepare,
191171
.is_prepared = clk_prcmu_is_prepared,
192-
.enable = clk_prcmu_enable,
193-
.disable = clk_prcmu_disable,
194-
.is_enabled = clk_prcmu_is_enabled,
195172
.recalc_rate = clk_prcmu_recalc_rate,
196173
.round_rate = clk_prcmu_round_rate,
197174
.set_rate = clk_prcmu_set_rate,
@@ -201,41 +178,30 @@ static const struct clk_ops clk_prcmu_gate_ops = {
201178
.prepare = clk_prcmu_prepare,
202179
.unprepare = clk_prcmu_unprepare,
203180
.is_prepared = clk_prcmu_is_prepared,
204-
.enable = clk_prcmu_enable,
205-
.disable = clk_prcmu_disable,
206-
.is_enabled = clk_prcmu_is_enabled,
207181
.recalc_rate = clk_prcmu_recalc_rate,
208182
};
209183

210184
static const struct clk_ops clk_prcmu_scalable_rate_ops = {
211-
.is_enabled = clk_prcmu_is_enabled,
212185
.recalc_rate = clk_prcmu_recalc_rate,
213186
.round_rate = clk_prcmu_round_rate,
214187
.set_rate = clk_prcmu_set_rate,
215188
};
216189

217190
static const struct clk_ops clk_prcmu_rate_ops = {
218-
.is_enabled = clk_prcmu_is_enabled,
219191
.recalc_rate = clk_prcmu_recalc_rate,
220192
};
221193

222194
static const struct clk_ops clk_prcmu_opp_gate_ops = {
223195
.prepare = clk_prcmu_opp_prepare,
224196
.unprepare = clk_prcmu_opp_unprepare,
225197
.is_prepared = clk_prcmu_is_prepared,
226-
.enable = clk_prcmu_enable,
227-
.disable = clk_prcmu_disable,
228-
.is_enabled = clk_prcmu_is_enabled,
229198
.recalc_rate = clk_prcmu_recalc_rate,
230199
};
231200

232201
static const struct clk_ops clk_prcmu_opp_volt_scalable_ops = {
233202
.prepare = clk_prcmu_opp_volt_prepare,
234203
.unprepare = clk_prcmu_opp_volt_unprepare,
235204
.is_prepared = clk_prcmu_is_prepared,
236-
.enable = clk_prcmu_enable,
237-
.disable = clk_prcmu_disable,
238-
.is_enabled = clk_prcmu_is_enabled,
239205
.recalc_rate = clk_prcmu_recalc_rate,
240206
.round_rate = clk_prcmu_round_rate,
241207
.set_rate = clk_prcmu_set_rate,
@@ -263,7 +229,6 @@ static struct clk *clk_reg_prcmu(const char *name,
263229

264230
clk->cg_sel = cg_sel;
265231
clk->is_prepared = 1;
266-
clk->is_enabled = 1;
267232
clk->opp_requested = 0;
268233
/* "rate" can be used for changing the initial frequency */
269234
if (rate)

0 commit comments

Comments
 (0)