diff options
Diffstat (limited to 'arch/arm/mach-pxa/poodle.c')
-rw-r--r-- | arch/arm/mach-pxa/poodle.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index a113ea9ab4ab..69036e42ca31 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c | |||
@@ -16,6 +16,7 @@ | |||
16 | */ | 16 | */ |
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | #include <linux/export.h> | ||
19 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
20 | #include <linux/fb.h> | 21 | #include <linux/fb.h> |
21 | #include <linux/pm.h> | 22 | #include <linux/pm.h> |
@@ -165,8 +166,8 @@ static struct resource locomo_resources[] = { | |||
165 | .flags = IORESOURCE_MEM, | 166 | .flags = IORESOURCE_MEM, |
166 | }, | 167 | }, |
167 | [1] = { | 168 | [1] = { |
168 | .start = IRQ_GPIO(10), | 169 | .start = PXA_GPIO_TO_IRQ(10), |
169 | .end = IRQ_GPIO(10), | 170 | .end = PXA_GPIO_TO_IRQ(10), |
170 | .flags = IORESOURCE_IRQ, | 171 | .flags = IORESOURCE_IRQ, |
171 | }, | 172 | }, |
172 | }; | 173 | }; |
@@ -211,7 +212,7 @@ static struct spi_board_info poodle_spi_devices[] = { | |||
211 | .bus_num = 1, | 212 | .bus_num = 1, |
212 | .platform_data = &poodle_ads7846_info, | 213 | .platform_data = &poodle_ads7846_info, |
213 | .controller_data= &poodle_ads7846_chip, | 214 | .controller_data= &poodle_ads7846_chip, |
214 | .irq = gpio_to_irq(POODLE_GPIO_TP_INT), | 215 | .irq = PXA_GPIO_TO_IRQ(POODLE_GPIO_TP_INT), |
215 | }, | 216 | }, |
216 | }; | 217 | }; |
217 | 218 | ||
@@ -416,12 +417,7 @@ static struct i2c_board_info __initdata poodle_i2c_devices[] = { | |||
416 | 417 | ||
417 | static void poodle_poweroff(void) | 418 | static void poodle_poweroff(void) |
418 | { | 419 | { |
419 | arm_machine_restart('h', NULL); | 420 | pxa_restart('h', NULL); |
420 | } | ||
421 | |||
422 | static void poodle_restart(char mode, const char *cmd) | ||
423 | { | ||
424 | arm_machine_restart('h', cmd); | ||
425 | } | 421 | } |
426 | 422 | ||
427 | static void __init poodle_init(void) | 423 | static void __init poodle_init(void) |
@@ -429,7 +425,6 @@ static void __init poodle_init(void) | |||
429 | int ret = 0; | 425 | int ret = 0; |
430 | 426 | ||
431 | pm_power_off = poodle_poweroff; | 427 | pm_power_off = poodle_poweroff; |
432 | arm_pm_restart = poodle_restart; | ||
433 | 428 | ||
434 | PCFR |= PCFR_OPDE; | 429 | PCFR |= PCFR_OPDE; |
435 | 430 | ||
@@ -454,8 +449,8 @@ static void __init poodle_init(void) | |||
454 | poodle_init_spi(); | 449 | poodle_init_spi(); |
455 | } | 450 | } |
456 | 451 | ||
457 | static void __init fixup_poodle(struct machine_desc *desc, | 452 | static void __init fixup_poodle(struct tag *tags, char **cmdline, |
458 | struct tag *tags, char **cmdline, struct meminfo *mi) | 453 | struct meminfo *mi) |
459 | { | 454 | { |
460 | sharpsl_save_param(); | 455 | sharpsl_save_param(); |
461 | mi->nr_banks=1; | 456 | mi->nr_banks=1; |
@@ -471,4 +466,5 @@ MACHINE_START(POODLE, "SHARP Poodle") | |||
471 | .handle_irq = pxa25x_handle_irq, | 466 | .handle_irq = pxa25x_handle_irq, |
472 | .timer = &pxa_timer, | 467 | .timer = &pxa_timer, |
473 | .init_machine = poodle_init, | 468 | .init_machine = poodle_init, |
469 | .restart = pxa_restart, | ||
474 | MACHINE_END | 470 | MACHINE_END |