Pull thermal into release branch

[linux-drm-fsl-dcu.git] / arch / powerpc / boot / ns16550.c

diff --git a/arch/powerpc/boot/ns16550.c b/arch/powerpc/boot/ns16550.c
index 1ffe72e35cdc8102d2d14c63b0b0132994678e60..f8f1b2f31412accf4bdfded110af68c813b4a7b7 100644 (file)
--- a/arch/powerpc/boot/ns16550.c
+++ b/arch/powerpc/boot/ns16550.c
@@ -55,10 +55,15 @@ static u8 ns16550_tstc(void)
 int ns16550_console_init(void *devp, struct serial_console_data *scdp)
 {
        int n;
+       unsigned long reg_phys;
 
        n = getprop(devp, "virtual-reg", &reg_base, sizeof(reg_base));
-       if (n != sizeof(reg_base))
-               return -1;
+       if (n != sizeof(reg_base)) {
+               if (!dt_xlate_reg(devp, 0, &reg_phys, NULL))
+                       return -1;
+
+               reg_base = (void *)reg_phys;
+       }
 
        n = getprop(devp, "reg-shift", &reg_shift, sizeof(reg_shift));
        if (n != sizeof(reg_shift))