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

Commit 9051785f authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'cpuidle/3.16' of git://git.linaro.org/people/daniel.lezcano/linux into pm-cpuidle 

Pull ARM cpuidle updates for v3.16 from Daniel Lezcano.

* 'cpuidle/3.16' of git://git.linaro.org/people/daniel.lezcano/linux:
  ARM: clps711x: Add cpuidle driver
parents a6220fc1 7c7f8f7f

drivers/cpuidle/Kconfig.arm

+6 −0
Original line number Diff line number Diff line
@@ -13,6 +13,12 @@ config ARM_BIG_LITTLE_CPUIDLE 
	  define different C-states for little and big cores through the

	  multiple CPU idle drivers infrastructure.



config ARM_CLPS711X_CPUIDLE

	bool "CPU Idle Driver for CLPS711X processors"

	depends on ARCH_CLPS711X || COMPILE_TEST

	help

	  Select this to enable cpuidle on Cirrus Logic CLPS711X SOCs.



config ARM_HIGHBANK_CPUIDLE

	bool "CPU Idle Driver for Calxeda processors"

	depends on ARM_PSCI

drivers/cpuidle/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o 
##################################################################################

# ARM SoC drivers

obj-$(CONFIG_ARM_BIG_LITTLE_CPUIDLE)	+= cpuidle-big_little.o

obj-$(CONFIG_ARM_CLPS711X_CPUIDLE)	+= cpuidle-clps711x.o

obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE)	+= cpuidle-calxeda.o

obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE)	+= cpuidle-kirkwood.o

obj-$(CONFIG_ARM_ZYNQ_CPUIDLE)		+= cpuidle-zynq.o

drivers/cpuidle/cpuidle-clps711x.c

0 → 100644
+64 −0
Original line number Diff line number Diff line 
/*

 *  CLPS711X CPU idle driver

 *

 *  Copyright (C) 2014 Alexander Shiyan <shc_work@mail.ru>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#include <linux/cpuidle.h>

#include <linux/err.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/platform_device.h>



#define CLPS711X_CPUIDLE_NAME	"clps711x-cpuidle"



static void __iomem *clps711x_halt;



static int clps711x_cpuidle_halt(struct cpuidle_device *dev,

				 struct cpuidle_driver *drv, int index)

{

	writel(0xaa, clps711x_halt);



	return index;

}



static struct cpuidle_driver clps711x_idle_driver = {

	.name		= CLPS711X_CPUIDLE_NAME,

	.owner		= THIS_MODULE,

	.states[0]	= {

		.name		= "HALT",

		.desc		= "CLPS711X HALT",

		.enter		= clps711x_cpuidle_halt,

		.exit_latency	= 1,

	},

	.state_count	= 1,

};



static int __init clps711x_cpuidle_probe(struct platform_device *pdev)

{

	struct resource *res;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	clps711x_halt = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(clps711x_halt))

		return PTR_ERR(clps711x_halt);



	return cpuidle_register(&clps711x_idle_driver, NULL);

}



static struct platform_driver clps711x_cpuidle_driver = {

	.driver	= {

		.name	= CLPS711X_CPUIDLE_NAME,

		.owner	= THIS_MODULE,

	},

};

module_platform_driver_probe(clps711x_cpuidle_driver, clps711x_cpuidle_probe);



MODULE_AUTHOR("Alexander Shiyan <shc_work@mail.ru>");

MODULE_DESCRIPTION("CLPS711X CPU idle driver");

MODULE_LICENSE("GPL");