summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorFrank Li <Frank.Li@freescale.com>2010-04-07 13:33:17 +0800
committerAlejandro Gonzalez <alex.gonzalez@digi.com>2010-05-25 11:20:22 +0200
commitbcd64ee41f84611baa03ea12f887256015b87ef6 (patch)
treeced189e50377ec973dbce9c0678420d57a2b2f0e /arch
parentd31c1353478570d3597f7d1214a4ce295caae7c5 (diff)
ENGR00122314 MX23 fix I2C DMA channel issue
fix I2C DMA issue. Signed-off-by: Frank Li <Frank.Li@freescale.com> Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mx23/device.c4
-rw-r--r--arch/arm/mach-mx23/include/mach/dma.h18
2 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/mach-mx23/device.c b/arch/arm/mach-mx23/device.c
index 9d56f9aa4ff9..33c4d7d5c845 100644
--- a/arch/arm/mach-mx23/device.c
+++ b/arch/arm/mach-mx23/device.c
@@ -236,8 +236,8 @@ static struct resource i2c_resource[] = {
},
{
.flags = IORESOURCE_DMA,
- .start = MXS_DMA_CHANNEL_AHB_APBX_I2C0,
- .end = MXS_DMA_CHANNEL_AHB_APBX_I2C0,
+ .start = MXS_DMA_CHANNEL_AHB_APBX_I2C,
+ .end = MXS_DMA_CHANNEL_AHB_APBX_I2C,
},
{
.flags = IORESOURCE_IRQ,
diff --git a/arch/arm/mach-mx23/include/mach/dma.h b/arch/arm/mach-mx23/include/mach/dma.h
index 5fc24275ab3c..ae4b7782892b 100644
--- a/arch/arm/mach-mx23/include/mach/dma.h
+++ b/arch/arm/mach-mx23/include/mach/dma.h
@@ -41,19 +41,19 @@ enum {
MXS_DMA_CHANNEL_AHB_APBX_AUDIOADC = MXS_DMA_CHANNEL_AHB_APBX,
MXS_DMA_CHANNEL_AHB_APBX_AUDIODAC,
MXS_DMA_CHANNEL_AHB_APBX_SPDIF,
- MXS_DMA_CHANNEL_AHB_APBX_03,
- MXS_DMA_CHANNEL_AHB_APBX_SAIF0,
+ MXS_DMA_CHANNEL_AHB_APBX_I2C,
MXS_DMA_CHANNEL_AHB_APBX_SAIF1,
+ MXS_DMA_CHANNEL_AHB_APBX_DRI,
MXS_DMA_CHANNEL_AHB_APBX_UART1_RX,
MXS_DMA_CHANNEL_AHB_APBX_UART1_TX,
MXS_DMA_CHANNEL_AHB_APBX_UART2_RX,
MXS_DMA_CHANNEL_AHB_APBX_UART2_TX,
- MXS_DMA_CHANNEL_AHB_APBX_I2C0,
- MXS_DMA_CHANNEL_AHB_APBX_I2C1,
- MXS_DMA_CHANNEL_AHB_APBX_UART0_RX,
- MXS_DMA_CHANNEL_AHB_APBX_UART0_TX,
- MXS_DMA_CHANNEL_AHB_APBX_UART3_RX,
- MXS_DMA_CHANNEL_AHB_APBX_UART3_TX,
+ MXS_DMA_CHANNEL_AHB_APBX_SAIF2,
+ MXS_DMA_CHANNEL_AHB_APBX_RESERVED1,
+ MXS_DMA_CHANNEL_AHB_APBX_RESERVED2,
+ MXS_DMA_CHANNEL_AHB_APBX_RESERVED3,
+ MXS_DMA_CHANNEL_AHB_APBX_RESERVED4,
+ MXS_DMA_CHANNEL_AHB_APBX_RESERVED5,
MAX_DMA_CHANNELS,
};
-#endif /* __ASM_ARCH_MACH_MX28_H__ */
+#endif /* __ASM_ARCH_MACH_MX23_H__ */