Commit 2c81f0f6 authored by Tony Lindgren's avatar Tony Lindgren

bus: ti-sysc: Fix iterating over clocks

Commit d878970f ("bus: ti-sysc: Add separate functions for handling
clocks") separated handling of optional clocks from the main clocks, but
introduced an issue where we do not necessarily allocate a slot for both
fck and ick clocks, but still assume fixed slots for enumerating over the
clocks.

Let's fix the issue by ensuring we always have slots for both fck and ick
even if we don't use ick, and don't attempt to enumerate optional clocks
if not allocated.

In the long run we might want to simplify things a bit by only allocating
space only for the optional clocks as we have only few devices with
optional clocks.

Fixes: d878970f ("bus: ti-sysc: Add separate functions for handling clocks")
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 90bdfa0b
...@@ -343,6 +343,12 @@ static int sysc_get_clocks(struct sysc *ddata) ...@@ -343,6 +343,12 @@ static int sysc_get_clocks(struct sysc *ddata)
return -EINVAL; return -EINVAL;
} }
/* Always add a slot for main clocks fck and ick even if unused */
if (!nr_fck)
ddata->nr_clocks++;
if (!nr_ick)
ddata->nr_clocks++;
ddata->clocks = devm_kcalloc(ddata->dev, ddata->clocks = devm_kcalloc(ddata->dev,
ddata->nr_clocks, sizeof(*ddata->clocks), ddata->nr_clocks, sizeof(*ddata->clocks),
GFP_KERNEL); GFP_KERNEL);
...@@ -421,7 +427,7 @@ static int sysc_enable_opt_clocks(struct sysc *ddata) ...@@ -421,7 +427,7 @@ static int sysc_enable_opt_clocks(struct sysc *ddata)
struct clk *clock; struct clk *clock;
int i, error; int i, error;
if (!ddata->clocks) if (!ddata->clocks || ddata->nr_clocks < SYSC_OPTFCK0 + 1)
return 0; return 0;
for (i = SYSC_OPTFCK0; i < SYSC_MAX_CLOCKS; i++) { for (i = SYSC_OPTFCK0; i < SYSC_MAX_CLOCKS; i++) {
...@@ -455,7 +461,7 @@ static void sysc_disable_opt_clocks(struct sysc *ddata) ...@@ -455,7 +461,7 @@ static void sysc_disable_opt_clocks(struct sysc *ddata)
struct clk *clock; struct clk *clock;
int i; int i;
if (!ddata->clocks) if (!ddata->clocks || ddata->nr_clocks < SYSC_OPTFCK0 + 1)
return; return;
for (i = SYSC_OPTFCK0; i < SYSC_MAX_CLOCKS; i++) { for (i = SYSC_OPTFCK0; i < SYSC_MAX_CLOCKS; i++) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment