1 files changed, 14 insertions, 5 deletions

diff --git a/arch/powerpc/sysdev/cpm_common.c b/arch/powerpc/sysdev/cpm_common.c
index cb7df2dce44..e4b7296acb2 100644
--- a/arch/powerpc/sysdev/cpm_common.c
+++ b/arch/powerpc/sysdev/cpm_common.c
@@ -37,7 +37,7 @@ static void udbg_putc_cpm(char c)
         u8 __iomem *txbuf = (u8 __iomem __force *)in_be32(&cpm_udbg_txdesc[1]);
 
         if (c == '\n')
-                udbg_putc('\r');
+                udbg_putc_cpm('\r');
 
         while (in_be32(&cpm_udbg_txdesc[0]) & 0x80000000)
                 ;
@@ -53,7 +53,6 @@ void __init udbg_init_cpm(void)
                 setbat(1, 0xf0000000, 0xf0000000, 1024*1024, _PAGE_IO);
 #endif
                 udbg_putc = udbg_putc_cpm;
-                udbg_putc('X');
         }
 }
 #endif
@@ -85,9 +84,13 @@ int __init cpm_muram_init(void)
 
         np = of_find_compatible_node(NULL, NULL, "fsl,cpm-muram-data");
         if (!np) {
-                printk(KERN_ERR "Cannot find CPM muram data node");
-                ret = -ENODEV;
-                goto out;
+                /* try legacy bindings */
+                np = of_find_node_by_name(NULL, "data-only");
+                if (!np) {
+                        printk(KERN_ERR "Cannot find CPM muram data node");
+                        ret = -ENODEV;
+                        goto out;
+                }
         }
 
         muram_pbase = of_translate_address(np, zero);
@@ -189,6 +192,12 @@ void __iomem *cpm_muram_addr(unsigned long offset)
 }
 EXPORT_SYMBOL(cpm_muram_addr);
 
+unsigned long cpm_muram_offset(void __iomem *addr)
+{
+        return addr - (void __iomem *)muram_vbase;
+}
+EXPORT_SYMBOL(cpm_muram_offset);
+
 /**
  * cpm_muram_dma - turn a muram virtual address into a DMA address
  * @offset: virtual address from cpm_muram_addr() to convert