summaryrefslogtreecommitdiff
path: root/arch/ppc
diff options
context:
space:
mode:
authorJochen Friedrich <jochen@scram.de>2007-09-21 15:15:07 +0400
committerJochen Friedrich <jochen@scram.de>2007-09-25 22:48:00 +0400
commit1d7a8ee0ebcc26c98f21889fd900546ef2a02fa1 (patch)
tree8b62300f4799d199cce7cc83c568113f8c67d4db /arch/ppc
parentc5552ca48b312880ba9111411c98abfe72d88ea9 (diff)
downloadlinux-1d7a8ee0ebcc26c98f21889fd900546ef2a02fa1.tar.xz
[PPC] Fix cpm_dpram_addr returning phys mem instead of virt mem
cpm_dpram_addr returns physical memory of the DP RAM instead of iomapped virtual memory. As there usually is a 1:1 MMU map of the IMMR area, this is often not noticed. However, cpm_dpram_phys assumes this iomapped virtual memory and returns garbage on the 1:1 mapped memory causing CPM1 uart console to fail. This patch fixes the problem (copied from the powerpc tree). Signed-off-by: Jochen Friedrich <jochen@scram.de>
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/8xx_io/commproc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/8xx_io/commproc.c b/arch/ppc/8xx_io/commproc.c
index 7088428e1fe2..9da880be4dc0 100644
--- a/arch/ppc/8xx_io/commproc.c
+++ b/arch/ppc/8xx_io/commproc.c
@@ -459,7 +459,7 @@ EXPORT_SYMBOL(cpm_dpdump);
void *cpm_dpram_addr(unsigned long offset)
{
- return ((immap_t *)IMAP_ADDR)->im_cpm.cp_dpmem + offset;
+ return (void *)(dpram_vbase + offset);
}
EXPORT_SYMBOL(cpm_dpram_addr);