summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt1
-rw-r--r--drivers/cpufreq/cpufreq-cpu0.c30
2 files changed, 0 insertions, 31 deletions
diff --git a/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt b/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
index 274c06ff321..051f764bedb 100644
--- a/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
+++ b/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
@@ -15,7 +15,6 @@ Optional properties:
- clock-latency: Specify the possible maximum transition latency for clock,
in unit of nanoseconds.
- voltage-tolerance: Specify the CPU voltage tolerance in percentage.
-- reset-voltage: Voltage to set on panic
Examples:
diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c
index 15388b66db0..6bcbbc4105a 100644
--- a/drivers/cpufreq/cpufreq-cpu0.c
+++ b/drivers/cpufreq/cpufreq-cpu0.c
@@ -25,7 +25,6 @@
static unsigned int transition_latency;
static unsigned int voltage_tolerance; /* in percentage */
-static unsigned long reset_voltage;
static struct device *cpu_dev;
static struct clk *cpu_clk;
@@ -202,28 +201,6 @@ static struct notifier_block cpu0_cpufreq_reboot_notifier = {
.notifier_call = cpu0_cpufreq_reboot_notify,
};
-static int cpu0_cpufreq_panic_handler(struct notifier_block *nb,
- unsigned long event, void *unused)
-{
- int ret;
-
- is_suspended = true;
- if (cpu_reg && reset_voltage)
- ret = regulator_set_voltage(cpu_reg,
- reset_voltage, reset_voltage);
-
- if (ret)
- pr_err("Failed to set voltage on panic!\n");
-
- return NOTIFY_OK;
-}
-
-static struct notifier_block cpu0_cpufreq_panic_notifier = {
- .notifier_call = cpu0_cpufreq_panic_handler,
- .next = NULL,
- .priority = 250 /* priority: INT_MAX >= x >= 0 */
-};
-
static int cpu0_cpufreq_init(struct cpufreq_policy *policy)
{
int ret;
@@ -251,9 +228,6 @@ static int cpu0_cpufreq_init(struct cpufreq_policy *policy)
register_reboot_notifier(&cpu0_cpufreq_reboot_notifier);
- atomic_notifier_chain_register(&panic_notifier_list,
- &cpu0_cpufreq_panic_notifier);
-
return 0;
}
@@ -288,7 +262,6 @@ static struct cpufreq_driver cpu0_cpufreq_driver = {
static int cpu0_cpufreq_probe(struct platform_device *pdev)
{
struct device_node *np, *parent;
- u32 uV;
int ret;
parent = of_find_node_by_path("/cpus");
@@ -302,9 +275,6 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev)
break;
}
- if (!of_property_read_u32(np, "reset-voltage", &uV))
- reset_voltage = uV;
-
if (!np) {
pr_err("failed to find cpu0 node\n");
ret = -ENOENT;