Commit 93de83a2 authored by Tony Lindgren's avatar Tony Lindgren

bus: ti-sysc: Manage clocks for the interconnect target module in all cases

We are currently not managing interconnect target module clocks in the
for legacy platform data based case. This causes a problem for using the
platform data based functions when dropping the platform data for the
interconnect target module configuration.

To avoid a situation where we need to populate the main and optional
clocks also for the platform data based functions, let's just manage the
clocks directly in ti-sysc driver. This means that until the interconnect
target module confugration platform data is dropped our use count for
clk_enable() will be 2 instead of 1.
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a3e92e7b
...@@ -783,10 +783,8 @@ static int __maybe_unused sysc_runtime_suspend(struct device *dev) ...@@ -783,10 +783,8 @@ static int __maybe_unused sysc_runtime_suspend(struct device *dev)
if (ddata->legacy_mode) { if (ddata->legacy_mode) {
error = sysc_runtime_suspend_legacy(dev, ddata); error = sysc_runtime_suspend_legacy(dev, ddata);
if (!error) if (error)
ddata->enabled = false; return error;
return error;
} }
sysc_disable_main_clocks(ddata); sysc_disable_main_clocks(ddata);
...@@ -809,14 +807,6 @@ static int __maybe_unused sysc_runtime_resume(struct device *dev) ...@@ -809,14 +807,6 @@ static int __maybe_unused sysc_runtime_resume(struct device *dev)
if (ddata->enabled) if (ddata->enabled)
return 0; return 0;
if (ddata->legacy_mode) {
error = sysc_runtime_resume_legacy(dev, ddata);
if (!error)
ddata->enabled = true;
return error;
}
if (sysc_opt_clks_needed(ddata)) { if (sysc_opt_clks_needed(ddata)) {
error = sysc_enable_opt_clocks(ddata); error = sysc_enable_opt_clocks(ddata);
if (error) if (error)
...@@ -825,13 +815,21 @@ static int __maybe_unused sysc_runtime_resume(struct device *dev) ...@@ -825,13 +815,21 @@ static int __maybe_unused sysc_runtime_resume(struct device *dev)
error = sysc_enable_main_clocks(ddata); error = sysc_enable_main_clocks(ddata);
if (error) if (error)
goto err_main_clocks; goto err_opt_clocks;
if (ddata->legacy_mode) {
error = sysc_runtime_resume_legacy(dev, ddata);
if (error)
goto err_main_clocks;
}
ddata->enabled = true; ddata->enabled = true;
return 0; return 0;
err_main_clocks: err_main_clocks:
sysc_disable_main_clocks(ddata);
err_opt_clocks:
if (sysc_opt_clks_needed(ddata)) if (sysc_opt_clks_needed(ddata))
sysc_disable_opt_clocks(ddata); sysc_disable_opt_clocks(ddata);
......
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