From e657b9f1d38e550d0b5e32d3e891a20f8d61b89d Mon Sep 17 00:00:00 2001 From: Pankaj Kumar Date: Wed, 12 Oct 2011 20:11:12 +0530 Subject: [PATCH] msm: devices-msm7x30: Fix sdc3 and sdc4 CRCI Assignment. Due to some merge conflict SDC3 & SDC4 CRCI assignments are interchanged. Fix this with correct CRCI channel ID. It was leading to sd card detection failure also. Change-Id: I24355250b9b0779f09542b08cf34f48448a92d8e Signed-off-by: Pankaj Kumar --- arch/arm/mach-msm/devices-msm7x30.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c index e1a3b4c381a..0da9de3f7e0 100644 --- a/arch/arm/mach-msm/devices-msm7x30.c +++ b/arch/arm/mach-msm/devices-msm7x30.c @@ -666,14 +666,14 @@ static struct resource resources_sdc3[] = { }, { .name = "sdcc_dma_chnl", - .start = DMOV_SDC4_CHAN, - .end = DMOV_SDC4_CHAN, + .start = DMOV_SDC3_CHAN, + .end = DMOV_SDC3_CHAN, .flags = IORESOURCE_DMA, }, { .name = "sdcc_dma_crci", - .start = DMOV_SDC4_CRCI, - .end = DMOV_SDC4_CRCI, + .start = DMOV_SDC3_CRCI, + .end = DMOV_SDC3_CRCI, .flags = IORESOURCE_DMA, }, }; @@ -691,14 +691,14 @@ static struct resource resources_sdc4[] = { }, { .name = "sdcc_dma_chnl", - .start = DMOV_SDC3_CHAN, - .end = DMOV_SDC3_CHAN, + .start = DMOV_SDC4_CHAN, + .end = DMOV_SDC4_CHAN, .flags = IORESOURCE_DMA, }, { .name = "sdcc_dma_crci", - .start = DMOV_SDC3_CRCI, - .end = DMOV_SDC3_CRCI, + .start = DMOV_SDC4_CRCI, + .end = DMOV_SDC4_CRCI, .flags = IORESOURCE_DMA, }, };