diff options
| author | Richard Zhu <r65037@freescale.com> | 2010-06-29 15:07:56 +0800 |
|---|---|---|
| committer | Richard Zhu <r65037@freescale.com> | 2010-07-06 09:13:04 +0800 |
| commit | 38dac99bb0b7adcb114b3624d5681c629a3b4142 (patch) | |
| tree | 467a425978b36f32743a197a240fbe988e96a33a /arch/arm/mach-mx3/mx3_3stack.c | |
| parent | e35bbd2b5b77c206bdfe92a0a52f565a157db61a (diff) | |
ENGR00124736 Remerge the minor modifications to mainline
1 correct the pata platform device resource check codes
2 Change the end statment of the sdhc1 det pin
iomux definition on mx51 board from ',' to ';'.
3 sdhc driver max blk count on MX31, sinc
customer report that the emmc would be failed when
the blk count is more than 32.
Signed-off-by: Richard Zhu <r65037@freescale.com>
Diffstat (limited to 'arch/arm/mach-mx3/mx3_3stack.c')
| -rw-r--r-- | arch/arm/mach-mx3/mx3_3stack.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-mx3/mx3_3stack.c b/arch/arm/mach-mx3/mx3_3stack.c index 347f470e22f1..516890f020a4 100644 --- a/arch/arm/mach-mx3/mx3_3stack.c +++ b/arch/arm/mach-mx3/mx3_3stack.c @@ -855,16 +855,16 @@ static struct fsl_ata_platform_data ata_data = { }; static struct resource pata_fsl_resources[] = { - [0] = { /* I/O */ - .start = ATA_BASE_ADDR + 0x00, - .end = ATA_BASE_ADDR + 0xD8, - .flags = IORESOURCE_MEM, - }, - [2] = { /* IRQ */ - .start = MXC_INT_ATA, - .end = MXC_INT_ATA, - .flags = IORESOURCE_IRQ, - }, + { + .start = ATA_BASE_ADDR, + .end = ATA_BASE_ADDR + 0x000000D8, + .flags = IORESOURCE_MEM, + }, + { + .start = MXC_INT_ATA, + .end = MXC_INT_ATA, + .flags = IORESOURCE_IRQ, + }, }; static struct platform_device pata_fsl_device = { |