Skip to content

Commit

Permalink
ARM: highbank: cpuidle: convert to platform driver
Browse files Browse the repository at this point in the history
As the ux500 and the kirkwood driver, make the calxeda driver a platform driver

[Compiled only]

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
  • Loading branch information
Daniel Lezcano authored and Rob Herring committed Oct 1, 2013
1 parent 34a5eeb commit 60a66e3
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 6 deletions.
8 changes: 8 additions & 0 deletions arch/arm/mach-highbank/highbank.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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;
Expand All @@ -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 = {
Expand Down
18 changes: 12 additions & 6 deletions drivers/cpuidle/cpuidle-calxeda.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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);

0 comments on commit 60a66e3

Please sign in to comment.