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

Commit df67a2b7 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Simon Horman
Browse files

ARM: shmobile: cpuidle: Remove the pointless default driver 



The default idle driver uses one state with the WFI instruction.
The default idle routine invokes WFI when no cpuidle driver is present.

The default cpuidle driver is pointless and does not give more than the
default idle routine and moreover it pulls all the mathematics tied with
the cpuidle governor for nothing, hence consuming more energy.

Remove the default driver, the related code and register the driver directly.

[compiled only - no board - no test]

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent c517d838

arch/arm/mach-shmobile/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o 


# PM objects

obj-$(CONFIG_SUSPEND)		+= suspend.o

obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o

obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o

obj-$(CONFIG_PM_RCAR)		+= pm-rcar.o

obj-$(CONFIG_PM_RMOBILE)	+= pm-rmobile.o

arch/arm/mach-shmobile/common.h

+0 −9
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ struct clk; 
extern int shmobile_clk_init(void);

extern void shmobile_handle_irq_intc(struct pt_regs *);

extern struct platform_suspend_ops shmobile_suspend_ops;

struct cpuidle_driver;

extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv);



#ifdef CONFIG_SUSPEND

int shmobile_suspend_init(void);
@@ -34,12 +32,6 @@ static inline int shmobile_suspend_init(void) { return 0; } 
static inline void shmobile_smp_apmu_suspend_init(void) { }

#endif



#ifdef CONFIG_CPU_IDLE

int shmobile_cpuidle_init(void);

#else

static inline int shmobile_cpuidle_init(void) { return 0; }

#endif



#ifdef CONFIG_CPU_FREQ

int shmobile_cpufreq_init(void);

#else
@@ -51,7 +43,6 @@ extern void __iomem *shmobile_scu_base; 
static inline void __init shmobile_init_late(void)

{

	shmobile_suspend_init();

	shmobile_cpuidle_init();

	shmobile_cpufreq_init();

}

arch/arm/mach-shmobile/cpuidle.c

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
/*

 * CPUIdle support code for SH-Mobile ARM

 *

 *  Copyright (C) 2011 Magnus Damm

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#include <linux/pm.h>

#include <linux/cpuidle.h>

#include <linux/suspend.h>

#include <linux/module.h>

#include <linux/err.h>

#include <asm/cpuidle.h>

#include <asm/io.h>



static struct cpuidle_driver shmobile_cpuidle_default_driver = {

	.name			= "shmobile_cpuidle",

	.owner			= THIS_MODULE,

	.states[0]		= ARM_CPUIDLE_WFI_STATE,

	.safe_state_index	= 0, /* C1 */

	.state_count		= 1,

};



static struct cpuidle_driver *cpuidle_drv = &shmobile_cpuidle_default_driver;



void __init shmobile_cpuidle_set_driver(struct cpuidle_driver *drv)

{

	cpuidle_drv = drv;

}



int __init shmobile_cpuidle_init(void)

{

	return cpuidle_register(cpuidle_drv, NULL);

}

arch/arm/mach-shmobile/pm-sh7372.c

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ static struct cpuidle_driver sh7372_cpuidle_driver = { 


static void __init sh7372_cpuidle_init(void)

{

	shmobile_cpuidle_set_driver(&sh7372_cpuidle_driver);

	return cpuidle_register(cpuidle_drv, NULL);

}

#else

static void __init sh7372_cpuidle_init(void) {}