diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /arch/arm/mach-pxa/lpd270.c | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'arch/arm/mach-pxa/lpd270.c')
-rw-r--r-- | arch/arm/mach-pxa/lpd270.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c index 1a63eaa8986..c171d6ebee4 100644 --- a/arch/arm/mach-pxa/lpd270.c +++ b/arch/arm/mach-pxa/lpd270.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * it under the terms of the GNU General Public License version 2 as | 12 | * it under the terms of the GNU General Public License version 2 as |
13 | * published by the Free Software Foundation. | 13 | * published by the Free Software Foundation. |
14 | */ | 14 | */ |
15 | #include <linux/gpio.h> | 15 | |
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
18 | #include <linux/syscore_ops.h> | 18 | #include <linux/syscore_ops.h> |
@@ -39,12 +39,13 @@ | |||
39 | #include <asm/mach/flash.h> | 39 | #include <asm/mach/flash.h> |
40 | 40 | ||
41 | #include <mach/pxa27x.h> | 41 | #include <mach/pxa27x.h> |
42 | #include <mach/gpio.h> | ||
42 | #include <mach/lpd270.h> | 43 | #include <mach/lpd270.h> |
43 | #include <mach/audio.h> | 44 | #include <mach/audio.h> |
44 | #include <linux/platform_data/video-pxafb.h> | 45 | #include <mach/pxafb.h> |
45 | #include <linux/platform_data/mmc-pxamci.h> | 46 | #include <mach/mmc.h> |
46 | #include <linux/platform_data/irda-pxaficp.h> | 47 | #include <mach/irda.h> |
47 | #include <linux/platform_data/usb-ohci-pxa27x.h> | 48 | #include <mach/ohci.h> |
48 | #include <mach/smemc.h> | 49 | #include <mach/smemc.h> |
49 | 50 | ||
50 | #include "generic.h" | 51 | #include "generic.h" |
@@ -152,8 +153,8 @@ static void __init lpd270_init_irq(void) | |||
152 | handle_level_irq); | 153 | handle_level_irq); |
153 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); | 154 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); |
154 | } | 155 | } |
155 | irq_set_chained_handler(PXA_GPIO_TO_IRQ(0), lpd270_irq_handler); | 156 | irq_set_chained_handler(IRQ_GPIO(0), lpd270_irq_handler); |
156 | irq_set_irq_type(PXA_GPIO_TO_IRQ(0), IRQ_TYPE_EDGE_FALLING); | 157 | irq_set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING); |
157 | } | 158 | } |
158 | 159 | ||
159 | 160 | ||
@@ -479,7 +480,7 @@ static void __init lpd270_init(void) | |||
479 | 480 | ||
480 | static struct map_desc lpd270_io_desc[] __initdata = { | 481 | static struct map_desc lpd270_io_desc[] __initdata = { |
481 | { | 482 | { |
482 | .virtual = (unsigned long)LPD270_CPLD_VIRT, | 483 | .virtual = LPD270_CPLD_VIRT, |
483 | .pfn = __phys_to_pfn(LPD270_CPLD_PHYS), | 484 | .pfn = __phys_to_pfn(LPD270_CPLD_PHYS), |
484 | .length = LPD270_CPLD_SIZE, | 485 | .length = LPD270_CPLD_SIZE, |
485 | .type = MT_DEVICE, | 486 | .type = MT_DEVICE, |
@@ -498,12 +499,11 @@ static void __init lpd270_map_io(void) | |||
498 | 499 | ||
499 | MACHINE_START(LOGICPD_PXA270, "LogicPD PXA270 Card Engine") | 500 | MACHINE_START(LOGICPD_PXA270, "LogicPD PXA270 Card Engine") |
500 | /* Maintainer: Peter Barada */ | 501 | /* Maintainer: Peter Barada */ |
501 | .atag_offset = 0x100, | 502 | .boot_params = 0xa0000100, |
502 | .map_io = lpd270_map_io, | 503 | .map_io = lpd270_map_io, |
503 | .nr_irqs = LPD270_NR_IRQS, | 504 | .nr_irqs = LPD270_NR_IRQS, |
504 | .init_irq = lpd270_init_irq, | 505 | .init_irq = lpd270_init_irq, |
505 | .handle_irq = pxa27x_handle_irq, | 506 | .handle_irq = pxa27x_handle_irq, |
506 | .timer = &pxa_timer, | 507 | .timer = &pxa_timer, |
507 | .init_machine = lpd270_init, | 508 | .init_machine = lpd270_init, |
508 | .restart = pxa_restart, | ||
509 | MACHINE_END | 509 | MACHINE_END |