diff options
| -rw-r--r-- | arch/arm/mach-highbank/highbank.c | 8 | ||||
| -rw-r--r-- | drivers/cpuidle/cpuidle-calxeda.c | 18 |
2 files changed, 20 insertions, 6 deletions
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 8e63ccdb0de3..a78ed62d6542 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -25,6 +25,7 @@ #include <linux/of_address.h> #include <linux/amba/bus.h> #include <linux/clk-provider.h> +#include <linux/platform_device.h> #include <asm/cacheflush.h> #include <asm/cputype.h> @@ -153,6 +154,10 @@ static struct notifier_block highbank_platform_nb = { .notifier_call = highbank_platform_notifier, }; +static struct platform_device highbank_cpuidle_device = { + .name = "cpuidle-calxeda", +}; + static void __init highbank_init(void) { pm_power_off = highbank_power_off; @@ -162,6 +167,9 @@ static void __init highbank_init(void) bus_register_notifier(&amba_bustype, &highbank_amba_nb); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + + if (of_machine_is_compatible("calxeda,highbank")) + platform_device_register(&highbank_cpuidle_device); } static const char *highbank_match[] __initconst = { diff --git a/drivers/cpuidle/cpuidle-calxeda.c b/drivers/cpuidle/cpuidle-calxeda.c index bed707ab6d6e..6d49527d4a0c 100644 --- a/drivers/cpuidle/cpuidle-calxeda.c +++ b/drivers/cpuidle/cpuidle-calxeda.c @@ -24,10 +24,10 @@ #include <linux/cpu_pm.h> #include <linux/init.h> #include <linux/io.h> -#include <linux/of.h> #include <linux/time.h> #include <linux/delay.h> #include <linux/suspend.h> +#include <linux/platform_device.h> #include <asm/cpuidle.h> #include <asm/proc-fns.h> #include <asm/smp_scu.h> @@ -92,11 +92,17 @@ static struct cpuidle_driver calxeda_idle_driver = { .state_count = 2, }; -static int __init calxeda_cpuidle_init(void) +static int __init calxeda_cpuidle_probe(struct platform_device *pdev) { - if (!of_machine_is_compatible("calxeda,highbank")) - return -ENODEV; - return cpuidle_register(&calxeda_idle_driver, NULL); } -module_init(calxeda_cpuidle_init); + +static struct platform_driver calxeda_cpuidle_plat_driver = { + .driver = { + .name = "cpuidle-calxeda", + .owner = THIS_MODULE, + }, + .probe = calxeda_cpuidle_probe, +}; + +module_platform_driver(calxeda_cpuidle_plat_driver); |