aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-pxa/vpac270.c18
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)
542static struct pata_platform_info vpac270_pata_pdata = { 543static 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
565static struct platform_device vpac270_ide_device = { 572static 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