Commit bc638189 authored by Jochen Friedrich's avatar Jochen Friedrich Committed by Kumar Gala

[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: default avatarJochen Friedrich <jochen@scram.de>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 83af919e
...@@ -459,7 +459,7 @@ EXPORT_SYMBOL(cpm_dpdump); ...@@ -459,7 +459,7 @@ EXPORT_SYMBOL(cpm_dpdump);
void *cpm_dpram_addr(unsigned long offset) 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); EXPORT_SYMBOL(cpm_dpram_addr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment