diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2018-03-06 11:37:16 -0500 |
---|---|---|
committer | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2018-03-06 11:37:16 -0500 |
commit | 9fb1636c213541fbb3cd0a4491891bd5c5399406 (patch) | |
tree | a8f0da7fc39b8703237f50d00813157ec47f9b7c | |
parent | 1d5013f1b64dbd692975be5db0e42bac291c6de9 (diff) | |
parent | af8d30ac64e1ddef50981dc039f5773f57338b1a (diff) |
Merge branch 'for-v4.17/power_domains' into for-v4.17/next
-rw-r--r-- | drivers/soc/samsung/pm_domains.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/soc/samsung/pm_domains.c b/drivers/soc/samsung/pm_domains.c index b6a436594a19..cef30bdf19b1 100644 --- a/drivers/soc/samsung/pm_domains.c +++ b/drivers/soc/samsung/pm_domains.c | |||
@@ -147,6 +147,9 @@ static __init const char *exynos_get_domain_name(struct device_node *node) | |||
147 | return kstrdup_const(name, GFP_KERNEL); | 147 | return kstrdup_const(name, GFP_KERNEL); |
148 | } | 148 | } |
149 | 149 | ||
150 | static const char *soc_force_no_clk[] = { | ||
151 | }; | ||
152 | |||
150 | static __init int exynos4_pm_init_power_domain(void) | 153 | static __init int exynos4_pm_init_power_domain(void) |
151 | { | 154 | { |
152 | struct device_node *np; | 155 | struct device_node *np; |
@@ -183,6 +186,11 @@ static __init int exynos4_pm_init_power_domain(void) | |||
183 | pd->pd.power_on = exynos_pd_power_on; | 186 | pd->pd.power_on = exynos_pd_power_on; |
184 | pd->local_pwr_cfg = pm_domain_cfg->local_pwr_cfg; | 187 | pd->local_pwr_cfg = pm_domain_cfg->local_pwr_cfg; |
185 | 188 | ||
189 | for (i = 0; i < ARRAY_SIZE(soc_force_no_clk); i++) | ||
190 | if (of_find_compatible_node(NULL, NULL, | ||
191 | soc_force_no_clk[i])) | ||
192 | goto no_clk; | ||
193 | |||
186 | for (i = 0; i < MAX_CLK_PER_DOMAIN; i++) { | 194 | for (i = 0; i < MAX_CLK_PER_DOMAIN; i++) { |
187 | char clk_name[8]; | 195 | char clk_name[8]; |
188 | 196 | ||