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

Commit b19861a2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/cleanup-samsung-2' of... 

Merge branch 'next/cleanup-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into late/cleanup

* 'next/cleanup-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C64XX: use timekeeping wrapper on cpuidle
  ARM: S3C64XX: declare the states with the new api on cpuidle
parents 36be5051 aba607d6

arch/arm/mach-s3c64xx/cpuidle.c

+15 −30
Original line number Original line Diff line number Diff line
@@ -27,12 +27,7 @@ static int s3c64xx_enter_idle(struct cpuidle_device *dev, 
			      struct cpuidle_driver *drv,

			      struct cpuidle_driver *drv,

			      int index)

			      int index)

{

{

	struct timeval before, after;

	unsigned long tmp;

	unsigned long tmp;

	int idle_time;



	local_irq_disable();

	do_gettimeofday(&before);





	/* Setup PWRCFG to enter idle mode */

	/* Setup PWRCFG to enter idle mode */

	tmp = __raw_readl(S3C64XX_PWR_CFG);

	tmp = __raw_readl(S3C64XX_PWR_CFG);
@@ -42,17 +37,17 @@ static int s3c64xx_enter_idle(struct cpuidle_device *dev, 




	cpu_do_idle();

	cpu_do_idle();





	do_gettimeofday(&after);

	local_irq_enable();

	idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC +

		    (after.tv_usec - before.tv_usec);



	dev->last_residency = idle_time;

	return index;

	return index;

}

}





static struct cpuidle_state s3c64xx_cpuidle_set[] = {

static DEFINE_PER_CPU(struct cpuidle_device, s3c64xx_cpuidle_device);

	[0] = {



static struct cpuidle_driver s3c64xx_cpuidle_driver = {

	.name	= "s3c64xx_cpuidle",

	.owner  = THIS_MODULE,

	.en_core_tk_irqen = 1,

	.states = {

		{

			.enter            = s3c64xx_enter_idle,

			.enter            = s3c64xx_enter_idle,

			.exit_latency     = 1,

			.exit_latency     = 1,

			.target_residency = 1,

			.target_residency = 1,
@@ -60,24 +55,14 @@ static struct cpuidle_state s3c64xx_cpuidle_set[] = { 
			.name             = "IDLE",

			.name             = "IDLE",

			.desc             = "System active, ARM gated",

			.desc             = "System active, ARM gated",

		},

		},

};

	},



	.state_count = 1,

static struct cpuidle_driver s3c64xx_cpuidle_driver = {

	.name		= "s3c64xx_cpuidle",

	.owner		= THIS_MODULE,

	.state_count	= ARRAY_SIZE(s3c64xx_cpuidle_set),

};



static struct cpuidle_device s3c64xx_cpuidle_device = {

	.state_count	= ARRAY_SIZE(s3c64xx_cpuidle_set),

};

};





static int __init s3c64xx_init_cpuidle(void)

static int __init s3c64xx_init_cpuidle(void)

{

{

	int ret;

	int ret;





	memcpy(s3c64xx_cpuidle_driver.states, s3c64xx_cpuidle_set,

	       sizeof(s3c64xx_cpuidle_set));

	cpuidle_register_driver(&s3c64xx_cpuidle_driver);

	cpuidle_register_driver(&s3c64xx_cpuidle_driver);





	ret = cpuidle_register_device(&s3c64xx_cpuidle_device);

	ret = cpuidle_register_device(&s3c64xx_cpuidle_device);