diff options
Diffstat (limited to 'arch/arm/kernel/dma.c')
-rw-r--r-- | arch/arm/kernel/dma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/kernel/dma.c b/arch/arm/kernel/dma.c index 8d6381cd8915..3aedada71046 100644 --- a/arch/arm/kernel/dma.c +++ b/arch/arm/kernel/dma.c | |||
@@ -131,7 +131,7 @@ void set_dma_sg (dmach_t channel, struct scatterlist *sg, int nr_sg) | |||
131 | * | 131 | * |
132 | * Copy address to the structure, and set the invalid bit | 132 | * Copy address to the structure, and set the invalid bit |
133 | */ | 133 | */ |
134 | void set_dma_addr (dmach_t channel, unsigned long physaddr) | 134 | void __set_dma_addr (dmach_t channel, void *addr) |
135 | { | 135 | { |
136 | dma_t *dma = dma_chan + channel; | 136 | dma_t *dma = dma_chan + channel; |
137 | 137 | ||
@@ -141,7 +141,7 @@ void set_dma_addr (dmach_t channel, unsigned long physaddr) | |||
141 | 141 | ||
142 | dma->sg = &dma->buf; | 142 | dma->sg = &dma->buf; |
143 | dma->sgcount = 1; | 143 | dma->sgcount = 1; |
144 | dma->buf.__address = bus_to_virt(physaddr); | 144 | dma->buf.__address = addr; |
145 | dma->using_sg = 0; | 145 | dma->using_sg = 0; |
146 | dma->invalid = 1; | 146 | dma->invalid = 1; |
147 | } | 147 | } |
@@ -278,7 +278,7 @@ GLOBAL_ALIAS(get_dma_list, get_dma_residue); | |||
278 | GLOBAL_ALIAS(set_dma_mode, get_dma_residue); | 278 | GLOBAL_ALIAS(set_dma_mode, get_dma_residue); |
279 | GLOBAL_ALIAS(set_dma_page, get_dma_residue); | 279 | GLOBAL_ALIAS(set_dma_page, get_dma_residue); |
280 | GLOBAL_ALIAS(set_dma_count, get_dma_residue); | 280 | GLOBAL_ALIAS(set_dma_count, get_dma_residue); |
281 | GLOBAL_ALIAS(set_dma_addr, get_dma_residue); | 281 | GLOBAL_ALIAS(__set_dma_addr, get_dma_residue); |
282 | GLOBAL_ALIAS(set_dma_sg, get_dma_residue); | 282 | GLOBAL_ALIAS(set_dma_sg, get_dma_residue); |
283 | GLOBAL_ALIAS(set_dma_speed, get_dma_residue); | 283 | GLOBAL_ALIAS(set_dma_speed, get_dma_residue); |
284 | GLOBAL_ALIAS(init_dma, get_dma_residue); | 284 | GLOBAL_ALIAS(init_dma, get_dma_residue); |
@@ -289,7 +289,7 @@ EXPORT_SYMBOL(request_dma); | |||
289 | EXPORT_SYMBOL(free_dma); | 289 | EXPORT_SYMBOL(free_dma); |
290 | EXPORT_SYMBOL(enable_dma); | 290 | EXPORT_SYMBOL(enable_dma); |
291 | EXPORT_SYMBOL(disable_dma); | 291 | EXPORT_SYMBOL(disable_dma); |
292 | EXPORT_SYMBOL(set_dma_addr); | 292 | EXPORT_SYMBOL(__set_dma_addr); |
293 | EXPORT_SYMBOL(set_dma_count); | 293 | EXPORT_SYMBOL(set_dma_count); |
294 | EXPORT_SYMBOL(set_dma_mode); | 294 | EXPORT_SYMBOL(set_dma_mode); |
295 | EXPORT_SYMBOL(set_dma_page); | 295 | EXPORT_SYMBOL(set_dma_page); |