diff options
| author | Benoit Cousson <b-cousson@ti.com> | 2010-09-21 10:34:08 -0600 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2010-09-21 10:34:08 -0600 |
| commit | 9ee9fff92e02e8c5f84794b3a5ce47646c2dfc39 (patch) | |
| tree | 59b3904f78a379ab0e3eed6db274756b6009836e /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | b30a3f6257ed2105259b404d419b4964e363928c (diff) | |
| download | kernel_samsung_smdk4412-9ee9fff92e02e8c5f84794b3a5ce47646c2dfc39.tar.gz kernel_samsung_smdk4412-9ee9fff92e02e8c5f84794b3a5ce47646c2dfc39.tar.bz2 kernel_samsung_smdk4412-9ee9fff92e02e8c5f84794b3a5ce47646c2dfc39.zip | |
OMAP: hwmod: Rename dma_ch to dma_req
The dma request line attribute was named dma channel, which leads
to confusion with the real dma channel definition.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Tested-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index cb911d7d1a3..8bf19a7efb5 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -1468,7 +1468,7 @@ int omap_hwmod_count_resources(struct omap_hwmod *oh) { int ret, i; - ret = oh->mpu_irqs_cnt + oh->sdma_chs_cnt; + ret = oh->mpu_irqs_cnt + oh->sdma_reqs_cnt; for (i = 0; i < oh->slaves_cnt; i++) ret += oh->slaves[i]->addr_cnt; @@ -1501,10 +1501,10 @@ int omap_hwmod_fill_resources(struct omap_hwmod *oh, struct resource *res) r++; } - for (i = 0; i < oh->sdma_chs_cnt; i++) { - (res + r)->name = (oh->sdma_chs + i)->name; - (res + r)->start = (oh->sdma_chs + i)->dma_ch; - (res + r)->end = (oh->sdma_chs + i)->dma_ch; + for (i = 0; i < oh->sdma_reqs_cnt; i++) { + (res + r)->name = (oh->sdma_reqs + i)->name; + (res + r)->start = (oh->sdma_reqs + i)->dma_req; + (res + r)->end = (oh->sdma_reqs + i)->dma_req; (res + r)->flags = IORESOURCE_DMA; r++; } |