diff options
author | Sudhakar Rajashekhara <sudhakar.raj@ti.com> | 2009-12-14 21:01:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 11:53:34 -0500 |
commit | 3d348aaf5b4b7d5a65123f4afad3eae416b2903b (patch) | |
tree | fdc556091cc6cc2a2ca686f1d0d847eb56e31394 | |
parent | b4cff4549b7a8c5fc8b88e3493b6287555f0512c (diff) |
mmc: davinci: modify data types of EDMA related variables
Currently DaVinci EDMA driver supports multiple EDMA channel controller
instances. edma_alloc_channel() api returns a 32 bit value which has the
channel controller number in MSB and the EDMA channel number in LSB. The
variables which store the value returned by edma_alloc_channel() have to
be 32 bit wide now.
Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Acked-by: Vipin Bhandari <vipin.bhandari@ti.com>
Cc: Purshotam Kumar <purushotam@ti.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/mmc/host/davinci_mmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c index fe8f6135426d..6c76f64f46db 100644 --- a/drivers/mmc/host/davinci_mmc.c +++ b/drivers/mmc/host/davinci_mmc.c | |||
@@ -178,7 +178,7 @@ struct mmc_davinci_host { | |||
178 | u32 buffer_bytes_left; | 178 | u32 buffer_bytes_left; |
179 | u32 bytes_left; | 179 | u32 bytes_left; |
180 | 180 | ||
181 | u8 rxdma, txdma; | 181 | u32 rxdma, txdma; |
182 | bool use_dma; | 182 | bool use_dma; |
183 | bool do_dma; | 183 | bool do_dma; |
184 | 184 | ||
@@ -190,7 +190,7 @@ struct mmc_davinci_host { | |||
190 | struct edmacc_param tx_template; | 190 | struct edmacc_param tx_template; |
191 | struct edmacc_param rx_template; | 191 | struct edmacc_param rx_template; |
192 | unsigned n_link; | 192 | unsigned n_link; |
193 | u8 links[NR_SG - 1]; | 193 | u32 links[NR_SG - 1]; |
194 | 194 | ||
195 | /* For PIO we walk scatterlists one segment at a time. */ | 195 | /* For PIO we walk scatterlists one segment at a time. */ |
196 | unsigned int sg_len; | 196 | unsigned int sg_len; |