mmc: msm_sdcc: Move DMA CRCIs to device resources.
Instead of using the CRCIs directly in the MMC driver, pass them
to the driver via device resources.
Signed-off-by: Krishna Konda <kkonda@codeaurora.org>
diff --git a/arch/arm/mach-msm/devices-msm7x25.c b/arch/arm/mach-msm/devices-msm7x25.c
index 748229e..f0b24d7 100644
--- a/arch/arm/mach-msm/devices-msm7x25.c
+++ b/arch/arm/mach-msm/devices-msm7x25.c
@@ -438,10 +438,17 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC1_CHAN,
+ .end = DMOV_SDC1_CHAN,
.flags = IORESOURCE_DMA,
},
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC1_CRCI,
+ .end = DMOV_SDC1_CRCI,
+ .flags = IORESOURCE_DMA,
+ }
};
static struct resource resources_sdc2[] = {
@@ -456,10 +463,17 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC2_CHAN,
+ .end = DMOV_SDC2_CHAN,
.flags = IORESOURCE_DMA,
},
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC2_CRCI,
+ .end = DMOV_SDC2_CRCI,
+ .flags = IORESOURCE_DMA,
+ }
};
static struct resource resources_sdc3[] = {
@@ -474,8 +488,15 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC3_CHAN,
+ .end = DMOV_SDC3_CHAN,
+ .flags = IORESOURCE_DMA,
+ },
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC3_CRCI,
+ .end = DMOV_SDC3_CRCI,
.flags = IORESOURCE_DMA,
},
};
@@ -492,8 +513,15 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC4_CHAN,
+ .end = DMOV_SDC4_CHAN,
+ .flags = IORESOURCE_DMA,
+ },
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC4_CRCI,
+ .end = DMOV_SDC4_CRCI,
.flags = IORESOURCE_DMA,
},
};
diff --git a/arch/arm/mach-msm/devices-msm7x27.c b/arch/arm/mach-msm/devices-msm7x27.c
index c74ff29..63d3d8a 100644
--- a/arch/arm/mach-msm/devices-msm7x27.c
+++ b/arch/arm/mach-msm/devices-msm7x27.c
@@ -433,10 +433,17 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC1_CHAN,
+ .end = DMOV_SDC1_CHAN,
.flags = IORESOURCE_DMA,
},
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC1_CRCI,
+ .end = DMOV_SDC1_CRCI,
+ .flags = IORESOURCE_DMA,
+ }
};
static struct resource resources_sdc2[] = {
@@ -451,10 +458,17 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC2_CHAN,
+ .end = DMOV_SDC2_CHAN,
.flags = IORESOURCE_DMA,
},
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC2_CRCI,
+ .end = DMOV_SDC2_CRCI,
+ .flags = IORESOURCE_DMA,
+ }
};
static struct resource resources_sdc3[] = {
@@ -469,8 +483,15 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC3_CHAN,
+ .end = DMOV_SDC3_CHAN,
+ .flags = IORESOURCE_DMA,
+ },
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC3_CRCI,
+ .end = DMOV_SDC3_CRCI,
.flags = IORESOURCE_DMA,
},
};
@@ -487,8 +508,15 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC4_CHAN,
+ .end = DMOV_SDC4_CHAN,
+ .flags = IORESOURCE_DMA,
+ },
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC4_CRCI,
+ .end = DMOV_SDC4_CRCI,
.flags = IORESOURCE_DMA,
},
};
diff --git a/arch/arm/mach-msm/devices-msm7x27a.c b/arch/arm/mach-msm/devices-msm7x27a.c
index ac5c2bf..2e59117 100644
--- a/arch/arm/mach-msm/devices-msm7x27a.c
+++ b/arch/arm/mach-msm/devices-msm7x27a.c
@@ -362,10 +362,17 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC1_CHAN,
+ .end = DMOV_SDC1_CHAN,
.flags = IORESOURCE_DMA,
},
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC1_CRCI,
+ .end = DMOV_SDC1_CRCI,
+ .flags = IORESOURCE_DMA,
+ }
};
static struct resource resources_sdc2[] = {
@@ -380,10 +387,17 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC2_CHAN,
+ .end = DMOV_SDC2_CHAN,
.flags = IORESOURCE_DMA,
},
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC2_CRCI,
+ .end = DMOV_SDC2_CRCI,
+ .flags = IORESOURCE_DMA,
+ }
};
static struct resource resources_sdc3[] = {
@@ -398,8 +412,15 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC4_CHAN,
+ .end = DMOV_SDC4_CHAN,
+ .flags = IORESOURCE_DMA,
+ },
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC4_CRCI,
+ .end = DMOV_SDC4_CRCI,
.flags = IORESOURCE_DMA,
},
};
@@ -416,8 +437,15 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC3_CHAN,
+ .end = DMOV_SDC3_CHAN,
+ .flags = IORESOURCE_DMA,
+ },
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC3_CRCI,
+ .end = DMOV_SDC3_CRCI,
.flags = IORESOURCE_DMA,
},
};
diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c
index 92f0010..a6c2a12 100644
--- a/arch/arm/mach-msm/devices-msm7x30.c
+++ b/arch/arm/mach-msm/devices-msm7x30.c
@@ -615,10 +615,17 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC1_CHAN,
+ .end = DMOV_SDC1_CHAN,
.flags = IORESOURCE_DMA,
},
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC1_CRCI,
+ .end = DMOV_SDC1_CRCI,
+ .flags = IORESOURCE_DMA,
+ }
};
static struct resource resources_sdc2[] = {
@@ -633,10 +640,17 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC2_CHAN,
+ .end = DMOV_SDC2_CHAN,
.flags = IORESOURCE_DMA,
},
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC2_CRCI,
+ .end = DMOV_SDC2_CRCI,
+ .flags = IORESOURCE_DMA,
+ }
};
static struct resource resources_sdc3[] = {
@@ -651,8 +665,15 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC4_CHAN,
+ .end = DMOV_SDC4_CHAN,
+ .flags = IORESOURCE_DMA,
+ },
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC4_CRCI,
+ .end = DMOV_SDC4_CRCI,
.flags = IORESOURCE_DMA,
},
};
@@ -669,8 +690,15 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC3_CHAN,
+ .end = DMOV_SDC3_CHAN,
+ .flags = IORESOURCE_DMA,
+ },
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC3_CRCI,
+ .end = DMOV_SDC3_CRCI,
.flags = IORESOURCE_DMA,
},
};
diff --git a/arch/arm/mach-msm/devices-msm8x60.c b/arch/arm/mach-msm/devices-msm8x60.c
index 21b540c..21f8ce4 100644
--- a/arch/arm/mach-msm/devices-msm8x60.c
+++ b/arch/arm/mach-msm/devices-msm8x60.c
@@ -1079,10 +1079,17 @@
},
#else
{
+ .name = "sdcc_dma_chnl",
.start = DMOV_SDC1_CHAN,
.end = DMOV_SDC1_CHAN,
.flags = IORESOURCE_DMA,
},
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC1_CRCI,
+ .end = DMOV_SDC1_CRCI,
+ .flags = IORESOURCE_DMA,
+ }
#endif /* CONFIG_MMC_MSM_SPS_SUPPORT */
};
@@ -1118,10 +1125,17 @@
},
#else
{
+ .name = "sdcc_dma_chnl",
.start = DMOV_SDC2_CHAN,
.end = DMOV_SDC2_CHAN,
.flags = IORESOURCE_DMA,
},
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC2_CRCI,
+ .end = DMOV_SDC2_CRCI,
+ .flags = IORESOURCE_DMA,
+ }
#endif /* CONFIG_MMC_MSM_SPS_SUPPORT */
};
@@ -1157,10 +1171,17 @@
},
#else
{
+ .name = "sdcc_dma_chnl",
.start = DMOV_SDC3_CHAN,
.end = DMOV_SDC3_CHAN,
.flags = IORESOURCE_DMA,
},
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC3_CRCI,
+ .end = DMOV_SDC3_CRCI,
+ .flags = IORESOURCE_DMA,
+ },
#endif /* CONFIG_MMC_MSM_SPS_SUPPORT */
};
@@ -1196,10 +1217,17 @@
},
#else
{
+ .name = "sdcc_dma_chnl",
.start = DMOV_SDC4_CHAN,
.end = DMOV_SDC4_CHAN,
.flags = IORESOURCE_DMA,
},
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC4_CRCI,
+ .end = DMOV_SDC4_CRCI,
+ .flags = IORESOURCE_DMA,
+ },
#endif /* CONFIG_MMC_MSM_SPS_SUPPORT */
};
@@ -1235,10 +1263,17 @@
},
#else
{
+ .name = "sdcc_dma_chnl",
.start = DMOV_SDC5_CHAN,
.end = DMOV_SDC5_CHAN,
.flags = IORESOURCE_DMA,
},
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC5_CRCI,
+ .end = DMOV_SDC5_CRCI,
+ .flags = IORESOURCE_DMA,
+ },
#endif /* CONFIG_MMC_MSM_SPS_SUPPORT */
};
diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c
index c0caf70..901e777 100644
--- a/arch/arm/mach-msm/devices-qsd8x50.c
+++ b/arch/arm/mach-msm/devices-qsd8x50.c
@@ -469,10 +469,17 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC1_CHAN,
+ .end = DMOV_SDC1_CHAN,
.flags = IORESOURCE_DMA,
},
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC1_CRCI,
+ .end = DMOV_SDC1_CRCI,
+ .flags = IORESOURCE_DMA,
+ }
};
static struct resource resources_sdc2[] = {
@@ -487,10 +494,17 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC2_CHAN,
+ .end = DMOV_SDC2_CHAN,
.flags = IORESOURCE_DMA,
},
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC2_CRCI,
+ .end = DMOV_SDC2_CRCI,
+ .flags = IORESOURCE_DMA,
+ }
};
static struct resource resources_sdc3[] = {
@@ -505,8 +519,15 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC3_CHAN,
+ .end = DMOV_SDC3_CHAN,
+ .flags = IORESOURCE_DMA,
+ },
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC3_CRCI,
+ .end = DMOV_SDC3_CRCI,
.flags = IORESOURCE_DMA,
},
};
@@ -523,8 +544,15 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = 8,
- .end = 8,
+ .name = "sdcc_dma_chnl",
+ .start = DMOV_SDC4_CHAN,
+ .end = DMOV_SDC4_CHAN,
+ .flags = IORESOURCE_DMA,
+ },
+ {
+ .name = "sdcc_dma_crci",
+ .start = DMOV_SDC4_CRCI,
+ .end = DMOV_SDC4_CRCI,
.flags = IORESOURCE_DMA,
},
};