diff options
-rw-r--r-- | drivers/cpufreq/cpufreq-dt-platdev.c | 12 | ||||
-rw-r--r-- | drivers/cpufreq/ti-cpufreq.c | 2 | ||||
-rw-r--r-- | drivers/cpuidle/cpuidle-arm.c | 6 |
3 files changed, 17 insertions, 3 deletions
diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c index a020da7940d6..430edadca527 100644 --- a/drivers/cpufreq/cpufreq-dt-platdev.c +++ b/drivers/cpufreq/cpufreq-dt-platdev.c | |||
@@ -106,6 +106,18 @@ static const struct of_device_id whitelist[] __initconst = { | |||
106 | * platforms using "operating-points-v2" property. | 106 | * platforms using "operating-points-v2" property. |
107 | */ | 107 | */ |
108 | static const struct of_device_id blacklist[] __initconst = { | 108 | static const struct of_device_id blacklist[] __initconst = { |
109 | { .compatible = "calxeda,highbank", }, | ||
110 | { .compatible = "calxeda,ecx-2000", }, | ||
111 | |||
112 | { .compatible = "marvell,armadaxp", }, | ||
113 | |||
114 | { .compatible = "nvidia,tegra124", }, | ||
115 | |||
116 | { .compatible = "st,stih407", }, | ||
117 | { .compatible = "st,stih410", }, | ||
118 | |||
119 | { .compatible = "sigma,tango4", }, | ||
120 | |||
109 | { } | 121 | { } |
110 | }; | 122 | }; |
111 | 123 | ||
diff --git a/drivers/cpufreq/ti-cpufreq.c b/drivers/cpufreq/ti-cpufreq.c index b29cd3398463..4bf47de6101f 100644 --- a/drivers/cpufreq/ti-cpufreq.c +++ b/drivers/cpufreq/ti-cpufreq.c | |||
@@ -190,7 +190,7 @@ static int ti_cpufreq_setup_syscon_register(struct ti_cpufreq_data *opp_data) | |||
190 | 190 | ||
191 | static const struct of_device_id ti_cpufreq_of_match[] = { | 191 | static const struct of_device_id ti_cpufreq_of_match[] = { |
192 | { .compatible = "ti,am33xx", .data = &am3x_soc_data, }, | 192 | { .compatible = "ti,am33xx", .data = &am3x_soc_data, }, |
193 | { .compatible = "ti,am4372", .data = &am4x_soc_data, }, | 193 | { .compatible = "ti,am43", .data = &am4x_soc_data, }, |
194 | { .compatible = "ti,dra7", .data = &dra7_soc_data }, | 194 | { .compatible = "ti,dra7", .data = &dra7_soc_data }, |
195 | {}, | 195 | {}, |
196 | }; | 196 | }; |
diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c index 7080c384ad5d..52a75053ee03 100644 --- a/drivers/cpuidle/cpuidle-arm.c +++ b/drivers/cpuidle/cpuidle-arm.c | |||
@@ -104,13 +104,13 @@ static int __init arm_idle_init(void) | |||
104 | ret = dt_init_idle_driver(drv, arm_idle_state_match, 1); | 104 | ret = dt_init_idle_driver(drv, arm_idle_state_match, 1); |
105 | if (ret <= 0) { | 105 | if (ret <= 0) { |
106 | ret = ret ? : -ENODEV; | 106 | ret = ret ? : -ENODEV; |
107 | goto out_fail; | 107 | goto init_fail; |
108 | } | 108 | } |
109 | 109 | ||
110 | ret = cpuidle_register_driver(drv); | 110 | ret = cpuidle_register_driver(drv); |
111 | if (ret) { | 111 | if (ret) { |
112 | pr_err("Failed to register cpuidle driver\n"); | 112 | pr_err("Failed to register cpuidle driver\n"); |
113 | goto out_fail; | 113 | goto init_fail; |
114 | } | 114 | } |
115 | 115 | ||
116 | /* | 116 | /* |
@@ -149,6 +149,8 @@ static int __init arm_idle_init(void) | |||
149 | } | 149 | } |
150 | 150 | ||
151 | return 0; | 151 | return 0; |
152 | init_fail: | ||
153 | kfree(drv); | ||
152 | out_fail: | 154 | out_fail: |
153 | while (--cpu >= 0) { | 155 | while (--cpu >= 0) { |
154 | dev = per_cpu(cpuidle_devices, cpu); | 156 | dev = per_cpu(cpuidle_devices, cpu); |