summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJochen Friedrich <jochen@scram.de>2007-09-24 19:15:43 +0200
committerKumar Gala <galak@kernel.crashing.org>2007-09-28 17:26:30 +0200
commitd214602804a85e5da68b745ae69d9beaa5bedc93 (patch)
tree9e183a9a54b89f20a3366f71234719e5510f73dd /drivers
parent[PPC] Fix cpm_dpram_addr returning phys mem instead of virt mem (diff)
downloadlinux-d214602804a85e5da68b745ae69d9beaa5bedc93.tar.xz
linux-d214602804a85e5da68b745ae69d9beaa5bedc93.zip
[POWERPC] Fix cpm_uart driver for cpm1 machines
in cpm_uart_cpm1.h, DPRAM_BASE is assigned an address derived from cpmp. On ARC=ppc, this is a physical address with 1:1 DMA mapping which can't be used for arithmetric compare operations with virtual addresses returned by cpm_dpram_addr. This patch changes the assignment to use cpm_dpram_addr as well, like in cpm_uart_cpm2.h. Signed-off-by: Jochen Friedrich <jochen@scram.de> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/cpm_uart/cpm_uart_cpm1.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
index a99e45e2b6d8..2a6477834c3e 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.h
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
@@ -37,6 +37,6 @@ static inline void cpm_set_smc_fcr(volatile smc_uart_t * up)
up->smc_tfcr = SMC_EB;
}
-#define DPRAM_BASE ((unsigned char *)&cpmp->cp_dpmem[0])
+#define DPRAM_BASE ((unsigned char *)cpm_dpram_addr(0))
#endif