diff options
| author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2013-07-10 10:02:04 -0400 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2013-07-27 01:56:39 -0400 |
| commit | d3f2950f2adeea3da0317e952914b59adaa4cdb3 (patch) | |
| tree | be257db12595162a5cb27d510d67096486c690cf | |
| parent | 8457246b106cc4e53f2534309dbe35a973c7d046 (diff) | |
ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle
There is no more dependency with arch/arm headers, so we can safely move the
driver to the drivers/cpuidle directory.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | arch/arm/mach-ux500/Makefile | 1 | ||||
| -rw-r--r-- | drivers/cpuidle/Kconfig.arm | 8 | ||||
| -rw-r--r-- | drivers/cpuidle/Makefile | 1 | ||||
| -rw-r--r-- | drivers/cpuidle/cpuidle-ux500.c (renamed from arch/arm/mach-ux500/cpuidle.c) | 0 |
4 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index bf9b6be5b180..fe1f3e26b88b 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | 4 | ||
| 5 | obj-y := cpu.o devices.o devices-common.o \ | 5 | obj-y := cpu.o devices.o devices-common.o \ |
| 6 | id.o usb.o timer.o pm.o | 6 | id.o usb.o timer.o pm.o |
| 7 | obj-$(CONFIG_CPU_IDLE) += cpuidle.o | ||
| 8 | obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o | 7 | obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o |
| 9 | obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o devices-db8500.o | 8 | obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o devices-db8500.o |
| 10 | obj-$(CONFIG_MACH_MOP500) += board-mop500.o board-mop500-sdi.o \ | 9 | obj-$(CONFIG_MACH_MOP500) += board-mop500.o board-mop500-sdi.o \ |
diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm index 2c8f17d33ff4..b3302193c15a 100644 --- a/drivers/cpuidle/Kconfig.arm +++ b/drivers/cpuidle/Kconfig.arm | |||
| @@ -19,3 +19,11 @@ config ARM_ZYNQ_CPUIDLE | |||
| 19 | bool "CPU Idle Driver for Xilinx Zynq processors" | 19 | bool "CPU Idle Driver for Xilinx Zynq processors" |
| 20 | depends on ARCH_ZYNQ | 20 | depends on ARCH_ZYNQ |
| 21 | help | 21 | help |
| 22 | Select this to enable cpuidle on Xilinx Zynq processors. | ||
| 23 | |||
| 24 | config ARM_U8500_CPUIDLE | ||
| 25 | bool "Cpu Idle Driver for the ST-E u8500 processors" | ||
| 26 | depends on ARCH_U8500 | ||
| 27 | help | ||
| 28 | Select this to enable cpuidle for ST-E u8500 processors | ||
| 29 | |||
diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile index 77cf767b0875..0b9d200c7e45 100644 --- a/drivers/cpuidle/Makefile +++ b/drivers/cpuidle/Makefile | |||
| @@ -10,3 +10,4 @@ obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o | |||
| 10 | obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE) += cpuidle-calxeda.o | 10 | obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE) += cpuidle-calxeda.o |
| 11 | obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE) += cpuidle-kirkwood.o | 11 | obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE) += cpuidle-kirkwood.o |
| 12 | obj-$(CONFIG_ARM_ZYNQ_CPUIDLE) += cpuidle-zynq.o | 12 | obj-$(CONFIG_ARM_ZYNQ_CPUIDLE) += cpuidle-zynq.o |
| 13 | obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o | ||
diff --git a/arch/arm/mach-ux500/cpuidle.c b/drivers/cpuidle/cpuidle-ux500.c index e0564652af35..e0564652af35 100644 --- a/arch/arm/mach-ux500/cpuidle.c +++ b/drivers/cpuidle/cpuidle-ux500.c | |||