diff options
author | Marek Vasut <marek.vasut@gmail.com> | 2010-05-20 21:12:45 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2010-06-18 03:07:32 -0400 |
commit | 9b2dbdc7c98c7a6ae5935cc1b130c130a1074bec (patch) | |
tree | 8323376d2f60b817268b718f02d91268ed7cf40c /arch/arm | |
parent | 2dc6c6f15da97cb3e810963c80e981f19d42cd7d (diff) |
[ARM] pxa/vpac270: Convert to use PATA PXA driver
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-pxa/vpac270.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c index 9884fa978f16..fb4b801dab03 100644 --- a/arch/arm/mach-pxa/vpac270.c +++ b/arch/arm/mach-pxa/vpac270.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <mach/ohci.h> | 37 | #include <mach/ohci.h> |
38 | #include <mach/pxa27x-udc.h> | 38 | #include <mach/pxa27x-udc.h> |
39 | #include <mach/udc.h> | 39 | #include <mach/udc.h> |
40 | #include <mach/pata_pxa.h> | ||
40 | 41 | ||
41 | #include <plat/i2c.h> | 42 | #include <plat/i2c.h> |
42 | 43 | ||
@@ -538,9 +539,10 @@ static inline void vpac270_lcd_init(void) {} | |||
538 | /****************************************************************************** | 539 | /****************************************************************************** |
539 | * PATA IDE | 540 | * PATA IDE |
540 | ******************************************************************************/ | 541 | ******************************************************************************/ |
541 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | 542 | #if defined(CONFIG_PATA_PXA) || defined(CONFIG_PATA_PXA_MODULE) |
542 | static struct pata_platform_info vpac270_pata_pdata = { | 543 | static struct pata_pxa_pdata vpac270_pata_pdata = { |
543 | .ioport_shift = 1, | 544 | .reg_shift = 1, |
545 | .dma_dreq = 1, | ||
544 | .irq_flags = IRQF_TRIGGER_RISING, | 546 | .irq_flags = IRQF_TRIGGER_RISING, |
545 | }; | 547 | }; |
546 | 548 | ||
@@ -555,7 +557,12 @@ static struct resource vpac270_ide_resources[] = { | |||
555 | .end = PXA_CS3_PHYS + 0x15f, | 557 | .end = PXA_CS3_PHYS + 0x15f, |
556 | .flags = IORESOURCE_MEM | 558 | .flags = IORESOURCE_MEM |
557 | }, | 559 | }, |
558 | [2] = { /* IDE IRQ pin */ | 560 | [2] = { /* DMA Base address */ |
561 | .start = PXA_CS3_PHYS + 0x20, | ||
562 | .end = PXA_CS3_PHYS + 0x2f, | ||
563 | .flags = IORESOURCE_DMA | ||
564 | }, | ||
565 | [3] = { /* IDE IRQ pin */ | ||
559 | .start = gpio_to_irq(GPIO36_VPAC270_IDE_IRQ), | 566 | .start = gpio_to_irq(GPIO36_VPAC270_IDE_IRQ), |
560 | .end = gpio_to_irq(GPIO36_VPAC270_IDE_IRQ), | 567 | .end = gpio_to_irq(GPIO36_VPAC270_IDE_IRQ), |
561 | .flags = IORESOURCE_IRQ | 568 | .flags = IORESOURCE_IRQ |
@@ -563,11 +570,12 @@ static struct resource vpac270_ide_resources[] = { | |||
563 | }; | 570 | }; |
564 | 571 | ||
565 | static struct platform_device vpac270_ide_device = { | 572 | static struct platform_device vpac270_ide_device = { |
566 | .name = "pata_platform", | 573 | .name = "pata_pxa", |
567 | .num_resources = ARRAY_SIZE(vpac270_ide_resources), | 574 | .num_resources = ARRAY_SIZE(vpac270_ide_resources), |
568 | .resource = vpac270_ide_resources, | 575 | .resource = vpac270_ide_resources, |
569 | .dev = { | 576 | .dev = { |
570 | .platform_data = &vpac270_pata_pdata, | 577 | .platform_data = &vpac270_pata_pdata, |
578 | .coherent_dma_mask = 0xffffffff, | ||
571 | } | 579 | } |
572 | }; | 580 | }; |
573 | 581 | ||