diff options
author | Alexander Shiyan <shc_work@mail.ru> | 2014-06-19 11:26:35 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-07-06 19:52:15 -0400 |
commit | 2d57f248c7ffee5eb2f86a4a6901293fc0e646a9 (patch) | |
tree | 735cbf81e81a21bbc9522c668621741be5bee5dd /arch/arm/mach-clps711x | |
parent | dd99eef5f6472e30b6e13f6f4622f58e94d46809 (diff) |
ARM: clps711x: Switch CLPS711X subarch to use cpuidle driver
This patch removes old support for cpuidle and switches all current
users to use new cpuidle driver.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-clps711x')
-rw-r--r-- | arch/arm/mach-clps711x/board-autcpu12.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/board-cdb89712.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/board-clep7312.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/board-edb7211.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/board-p720t.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/common.c | 12 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/common.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/devices.c | 10 |
8 files changed, 10 insertions, 18 deletions
diff --git a/arch/arm/mach-clps711x/board-autcpu12.c b/arch/arm/mach-clps711x/board-autcpu12.c index d62ca16d5394..45abf6bd5f68 100644 --- a/arch/arm/mach-clps711x/board-autcpu12.c +++ b/arch/arm/mach-clps711x/board-autcpu12.c | |||
@@ -266,7 +266,6 @@ MACHINE_START(AUTCPU12, "autronix autcpu12") | |||
266 | /* Maintainer: Thomas Gleixner */ | 266 | /* Maintainer: Thomas Gleixner */ |
267 | .atag_offset = 0x20000, | 267 | .atag_offset = 0x20000, |
268 | .map_io = clps711x_map_io, | 268 | .map_io = clps711x_map_io, |
269 | .init_early = clps711x_init_early, | ||
270 | .init_irq = clps711x_init_irq, | 269 | .init_irq = clps711x_init_irq, |
271 | .init_time = clps711x_timer_init, | 270 | .init_time = clps711x_timer_init, |
272 | .init_machine = autcpu12_init, | 271 | .init_machine = autcpu12_init, |
diff --git a/arch/arm/mach-clps711x/board-cdb89712.c b/arch/arm/mach-clps711x/board-cdb89712.c index e261a47f2aff..1ec378c334e5 100644 --- a/arch/arm/mach-clps711x/board-cdb89712.c +++ b/arch/arm/mach-clps711x/board-cdb89712.c | |||
@@ -140,7 +140,6 @@ MACHINE_START(CDB89712, "Cirrus-CDB89712") | |||
140 | /* Maintainer: Ray Lehtiniemi */ | 140 | /* Maintainer: Ray Lehtiniemi */ |
141 | .atag_offset = 0x100, | 141 | .atag_offset = 0x100, |
142 | .map_io = clps711x_map_io, | 142 | .map_io = clps711x_map_io, |
143 | .init_early = clps711x_init_early, | ||
144 | .init_irq = clps711x_init_irq, | 143 | .init_irq = clps711x_init_irq, |
145 | .init_time = clps711x_timer_init, | 144 | .init_time = clps711x_timer_init, |
146 | .init_machine = cdb89712_init, | 145 | .init_machine = cdb89712_init, |
diff --git a/arch/arm/mach-clps711x/board-clep7312.c b/arch/arm/mach-clps711x/board-clep7312.c index 94a7add88a3f..b33ba2116ec4 100644 --- a/arch/arm/mach-clps711x/board-clep7312.c +++ b/arch/arm/mach-clps711x/board-clep7312.c | |||
@@ -37,7 +37,6 @@ MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312") | |||
37 | .atag_offset = 0x0100, | 37 | .atag_offset = 0x0100, |
38 | .fixup = fixup_clep7312, | 38 | .fixup = fixup_clep7312, |
39 | .map_io = clps711x_map_io, | 39 | .map_io = clps711x_map_io, |
40 | .init_early = clps711x_init_early, | ||
41 | .init_irq = clps711x_init_irq, | 40 | .init_irq = clps711x_init_irq, |
42 | .init_time = clps711x_timer_init, | 41 | .init_time = clps711x_timer_init, |
43 | .restart = clps711x_restart, | 42 | .restart = clps711x_restart, |
diff --git a/arch/arm/mach-clps711x/board-edb7211.c b/arch/arm/mach-clps711x/board-edb7211.c index f9828f89972a..7ad94ff1da28 100644 --- a/arch/arm/mach-clps711x/board-edb7211.c +++ b/arch/arm/mach-clps711x/board-edb7211.c | |||
@@ -178,7 +178,6 @@ MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)") | |||
178 | .fixup = fixup_edb7211, | 178 | .fixup = fixup_edb7211, |
179 | .reserve = edb7211_reserve, | 179 | .reserve = edb7211_reserve, |
180 | .map_io = clps711x_map_io, | 180 | .map_io = clps711x_map_io, |
181 | .init_early = clps711x_init_early, | ||
182 | .init_irq = clps711x_init_irq, | 181 | .init_irq = clps711x_init_irq, |
183 | .init_time = clps711x_timer_init, | 182 | .init_time = clps711x_timer_init, |
184 | .init_machine = edb7211_init, | 183 | .init_machine = edb7211_init, |
diff --git a/arch/arm/mach-clps711x/board-p720t.c b/arch/arm/mach-clps711x/board-p720t.c index 0cf0e51e6546..b9937676b6be 100644 --- a/arch/arm/mach-clps711x/board-p720t.c +++ b/arch/arm/mach-clps711x/board-p720t.c | |||
@@ -365,7 +365,6 @@ MACHINE_START(P720T, "ARM-Prospector720T") | |||
365 | .atag_offset = 0x100, | 365 | .atag_offset = 0x100, |
366 | .fixup = fixup_p720t, | 366 | .fixup = fixup_p720t, |
367 | .map_io = clps711x_map_io, | 367 | .map_io = clps711x_map_io, |
368 | .init_early = clps711x_init_early, | ||
369 | .init_irq = clps711x_init_irq, | 368 | .init_irq = clps711x_init_irq, |
370 | .init_time = clps711x_timer_init, | 369 | .init_time = clps711x_timer_init, |
371 | .init_machine = p720t_init, | 370 | .init_machine = p720t_init, |
diff --git a/arch/arm/mach-clps711x/common.c b/arch/arm/mach-clps711x/common.c index aee81fa46ccf..2a6323b15782 100644 --- a/arch/arm/mach-clps711x/common.c +++ b/arch/arm/mach-clps711x/common.c | |||
@@ -193,15 +193,3 @@ void clps711x_restart(enum reboot_mode mode, const char *cmd) | |||
193 | { | 193 | { |
194 | soft_restart(0); | 194 | soft_restart(0); |
195 | } | 195 | } |
196 | |||
197 | static void clps711x_idle(void) | ||
198 | { | ||
199 | clps_writel(1, HALT); | ||
200 | asm("mov r0, r0"); | ||
201 | asm("mov r0, r0"); | ||
202 | } | ||
203 | |||
204 | void __init clps711x_init_early(void) | ||
205 | { | ||
206 | arm_pm_idle = clps711x_idle; | ||
207 | } | ||
diff --git a/arch/arm/mach-clps711x/common.h b/arch/arm/mach-clps711x/common.h index 7489139d5d63..f88189963898 100644 --- a/arch/arm/mach-clps711x/common.h +++ b/arch/arm/mach-clps711x/common.h | |||
@@ -13,7 +13,6 @@ extern void clps711x_map_io(void); | |||
13 | extern void clps711x_init_irq(void); | 13 | extern void clps711x_init_irq(void); |
14 | extern void clps711x_timer_init(void); | 14 | extern void clps711x_timer_init(void); |
15 | extern void clps711x_restart(enum reboot_mode mode, const char *cmd); | 15 | extern void clps711x_restart(enum reboot_mode mode, const char *cmd); |
16 | extern void clps711x_init_early(void); | ||
17 | 16 | ||
18 | /* drivers/irqchip/irq-clps711x.c */ | 17 | /* drivers/irqchip/irq-clps711x.c */ |
19 | void clps711x_intc_init(phys_addr_t, resource_size_t); | 18 | void clps711x_intc_init(phys_addr_t, resource_size_t); |
diff --git a/arch/arm/mach-clps711x/devices.c b/arch/arm/mach-clps711x/devices.c index 2001488a5ef2..0c689d3a6710 100644 --- a/arch/arm/mach-clps711x/devices.c +++ b/arch/arm/mach-clps711x/devices.c | |||
@@ -14,6 +14,15 @@ | |||
14 | 14 | ||
15 | #include <mach/hardware.h> | 15 | #include <mach/hardware.h> |
16 | 16 | ||
17 | static const struct resource clps711x_cpuidle_res __initconst = | ||
18 | DEFINE_RES_MEM(CLPS711X_PHYS_BASE + HALT, SZ_128); | ||
19 | |||
20 | static void __init clps711x_add_cpuidle(void) | ||
21 | { | ||
22 | platform_device_register_simple("clps711x-cpuidle", PLATFORM_DEVID_NONE, | ||
23 | &clps711x_cpuidle_res, 1); | ||
24 | } | ||
25 | |||
17 | static const phys_addr_t clps711x_gpios[][2] __initconst = { | 26 | static const phys_addr_t clps711x_gpios[][2] __initconst = { |
18 | { PADR, PADDR }, | 27 | { PADR, PADDR }, |
19 | { PBDR, PBDDR }, | 28 | { PBDR, PBDDR }, |
@@ -83,6 +92,7 @@ static void __init clps711x_add_uart(void) | |||
83 | 92 | ||
84 | void __init clps711x_devices_init(void) | 93 | void __init clps711x_devices_init(void) |
85 | { | 94 | { |
95 | clps711x_add_cpuidle(); | ||
86 | clps711x_add_gpio(); | 96 | clps711x_add_gpio(); |
87 | clps711x_add_syscon(); | 97 | clps711x_add_syscon(); |
88 | clps711x_add_uart(); | 98 | clps711x_add_uart(); |