Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8025395f authored by Linus Walleij's avatar Linus Walleij Committed by Daniel Lezcano
Browse files

ARM: ux500: cpuidle: Instantiate the driver from platform device 



To break the dependency on the "id.h" file we move the cpuidle driver
to a platform device. Now we only call the probe() on this driver if
we find a corresponding platform device (which is spawned from the
PRCMU MFD driver).

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 7006b8a1

arch/arm/mach-ux500/cpuidle.c

+11 −6
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 
#include <linux/smp.h>

#include <linux/mfd/dbx500-prcmu.h>

#include <linux/platform_data/arm-ux500-pm.h>

#include <linux/platform_device.h>



#include <asm/cpuidle.h>

#include <asm/proc-fns.h>



#include "db8500-regs.h"

#include "id.h"



static atomic_t master = ATOMIC_INIT(0);

static DEFINE_SPINLOCK(master_lock);
@@ -113,11 +113,8 @@ static struct cpuidle_driver ux500_idle_driver = { 
	.state_count = 2,

};



int __init ux500_idle_init(void)

static int __init dbx500_cpuidle_probe(struct platform_device *pdev)

{

	if (!(cpu_is_u8500_family() || cpu_is_ux540_family()))

		return -ENODEV;



	/* Configure wake up reasons */

	prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) |

			     PRCMU_WAKEUP(ABB));
@@ -125,4 +122,12 @@ int __init ux500_idle_init(void) 
	return cpuidle_register(&ux500_idle_driver, NULL);

}



device_initcall(ux500_idle_init);
 
static struct platform_driver dbx500_cpuidle_plat_driver = {

	.driver = {

		.name = "cpuidle-dbx500",

		.owner = THIS_MODULE,

	},

	.probe = dbx500_cpuidle_probe,

};



module_platform_driver(dbx500_cpuidle_plat_driver);

drivers/mfd/db8500-prcmu.c

+4 −0
Original line number Diff line number Diff line
@@ -3093,6 +3093,10 @@ static struct mfd_cell db8500_prcmu_devs[] = { 
		.platform_data = &db8500_cpufreq_table,

		.pdata_size = sizeof(db8500_cpufreq_table),

	},

	{

		.name = "cpuidle-dbx500",

		.of_compatible = "stericsson,cpuidle-dbx500",

	},

	{

		.name = "db8500-thermal",

		.num_resources = ARRAY_SIZE(db8500_thsens_resources),