Message ID | 1380248694-13388-4-git-send-email-robherring2@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 09/27/2013 04:24 AM, Rob Herring wrote: > From: Rob Herring <rob.herring@calxeda.com> > > Add cpuidle support for Calxeda ecx-2000 SoC. > > Signed-off-by: Rob Herring <rob.herring@calxeda.com> > Cc: "Rafael J. Wysocki" <rjw@sisk.pl> > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: linux-pm@vger.kernel.org Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> Shall I pick these three patches in my tree ?
On Fri, Sep 27, 2013 at 3:47 AM, Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > On 09/27/2013 04:24 AM, Rob Herring wrote: >> >> From: Rob Herring <rob.herring@calxeda.com> >> >> Add cpuidle support for Calxeda ecx-2000 SoC. >> >> Signed-off-by: Rob Herring <rob.herring@calxeda.com> >> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> >> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> >> Cc: linux-pm@vger.kernel.org > > > Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> Thanks. > Shall I pick these three patches in my tree ? No, the highbank changes are dependent on this to go in first. Rob
diff --git a/drivers/cpuidle/cpuidle-calxeda.c b/drivers/cpuidle/cpuidle-calxeda.c index b04767a..c6e9d80 100644 --- a/drivers/cpuidle/cpuidle-calxeda.c +++ b/drivers/cpuidle/cpuidle-calxeda.c @@ -66,7 +66,9 @@ static struct cpuidle_driver calxeda_idle_driver = { static int __init calxeda_cpuidle_init(void) { - if (!of_machine_is_compatible("calxeda,highbank") || !psci_ops.cpu_suspend) + if (!of_machine_is_compatible("calxeda,highbank") || + !of_machine_is_compatible("calxeda,ecx-2000") || + !psci_ops.cpu_suspend) return -ENODEV; return cpuidle_register(&calxeda_idle_driver, NULL);