Commit 2d57f248 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Olof Johansson

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: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent dd99eef5
...@@ -266,7 +266,6 @@ MACHINE_START(AUTCPU12, "autronix autcpu12") ...@@ -266,7 +266,6 @@ MACHINE_START(AUTCPU12, "autronix autcpu12")
/* Maintainer: Thomas Gleixner */ /* Maintainer: Thomas Gleixner */
.atag_offset = 0x20000, .atag_offset = 0x20000,
.map_io = clps711x_map_io, .map_io = clps711x_map_io,
.init_early = clps711x_init_early,
.init_irq = clps711x_init_irq, .init_irq = clps711x_init_irq,
.init_time = clps711x_timer_init, .init_time = clps711x_timer_init,
.init_machine = autcpu12_init, .init_machine = autcpu12_init,
......
...@@ -140,7 +140,6 @@ MACHINE_START(CDB89712, "Cirrus-CDB89712") ...@@ -140,7 +140,6 @@ MACHINE_START(CDB89712, "Cirrus-CDB89712")
/* Maintainer: Ray Lehtiniemi */ /* Maintainer: Ray Lehtiniemi */
.atag_offset = 0x100, .atag_offset = 0x100,
.map_io = clps711x_map_io, .map_io = clps711x_map_io,
.init_early = clps711x_init_early,
.init_irq = clps711x_init_irq, .init_irq = clps711x_init_irq,
.init_time = clps711x_timer_init, .init_time = clps711x_timer_init,
.init_machine = cdb89712_init, .init_machine = cdb89712_init,
......
...@@ -37,7 +37,6 @@ MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312") ...@@ -37,7 +37,6 @@ MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")
.atag_offset = 0x0100, .atag_offset = 0x0100,
.fixup = fixup_clep7312, .fixup = fixup_clep7312,
.map_io = clps711x_map_io, .map_io = clps711x_map_io,
.init_early = clps711x_init_early,
.init_irq = clps711x_init_irq, .init_irq = clps711x_init_irq,
.init_time = clps711x_timer_init, .init_time = clps711x_timer_init,
.restart = clps711x_restart, .restart = clps711x_restart,
......
...@@ -178,7 +178,6 @@ MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)") ...@@ -178,7 +178,6 @@ MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
.fixup = fixup_edb7211, .fixup = fixup_edb7211,
.reserve = edb7211_reserve, .reserve = edb7211_reserve,
.map_io = clps711x_map_io, .map_io = clps711x_map_io,
.init_early = clps711x_init_early,
.init_irq = clps711x_init_irq, .init_irq = clps711x_init_irq,
.init_time = clps711x_timer_init, .init_time = clps711x_timer_init,
.init_machine = edb7211_init, .init_machine = edb7211_init,
......
...@@ -365,7 +365,6 @@ MACHINE_START(P720T, "ARM-Prospector720T") ...@@ -365,7 +365,6 @@ MACHINE_START(P720T, "ARM-Prospector720T")
.atag_offset = 0x100, .atag_offset = 0x100,
.fixup = fixup_p720t, .fixup = fixup_p720t,
.map_io = clps711x_map_io, .map_io = clps711x_map_io,
.init_early = clps711x_init_early,
.init_irq = clps711x_init_irq, .init_irq = clps711x_init_irq,
.init_time = clps711x_timer_init, .init_time = clps711x_timer_init,
.init_machine = p720t_init, .init_machine = p720t_init,
......
...@@ -193,15 +193,3 @@ void clps711x_restart(enum reboot_mode mode, const char *cmd) ...@@ -193,15 +193,3 @@ void clps711x_restart(enum reboot_mode mode, const char *cmd)
{ {
soft_restart(0); soft_restart(0);
} }
static void clps711x_idle(void)
{
clps_writel(1, HALT);
asm("mov r0, r0");
asm("mov r0, r0");
}
void __init clps711x_init_early(void)
{
arm_pm_idle = clps711x_idle;
}
...@@ -13,7 +13,6 @@ extern void clps711x_map_io(void); ...@@ -13,7 +13,6 @@ extern void clps711x_map_io(void);
extern void clps711x_init_irq(void); extern void clps711x_init_irq(void);
extern void clps711x_timer_init(void); extern void clps711x_timer_init(void);
extern void clps711x_restart(enum reboot_mode mode, const char *cmd); extern void clps711x_restart(enum reboot_mode mode, const char *cmd);
extern void clps711x_init_early(void);
/* drivers/irqchip/irq-clps711x.c */ /* drivers/irqchip/irq-clps711x.c */
void clps711x_intc_init(phys_addr_t, resource_size_t); void clps711x_intc_init(phys_addr_t, resource_size_t);
...@@ -14,6 +14,15 @@ ...@@ -14,6 +14,15 @@
#include <mach/hardware.h> #include <mach/hardware.h>
static const struct resource clps711x_cpuidle_res __initconst =
DEFINE_RES_MEM(CLPS711X_PHYS_BASE + HALT, SZ_128);
static void __init clps711x_add_cpuidle(void)
{
platform_device_register_simple("clps711x-cpuidle", PLATFORM_DEVID_NONE,
&clps711x_cpuidle_res, 1);
}
static const phys_addr_t clps711x_gpios[][2] __initconst = { static const phys_addr_t clps711x_gpios[][2] __initconst = {
{ PADR, PADDR }, { PADR, PADDR },
{ PBDR, PBDDR }, { PBDR, PBDDR },
...@@ -83,6 +92,7 @@ static void __init clps711x_add_uart(void) ...@@ -83,6 +92,7 @@ static void __init clps711x_add_uart(void)
void __init clps711x_devices_init(void) void __init clps711x_devices_init(void)
{ {
clps711x_add_cpuidle();
clps711x_add_gpio(); clps711x_add_gpio();
clps711x_add_syscon(); clps711x_add_syscon();
clps711x_add_uart(); clps711x_add_uart();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment