From 07b367d6dd7cc7efcb528ac4c08664f91b4a482d Mon Sep 17 00:00:00 2001
From: John Linn <john.linn@xilinx.com>
Date: Thu, 3 Apr 2008 03:52:14 +1100
Subject: [PATCH] --- yaml --- r: 93472 b: refs/heads/master c:
 2f0b45f846735b486c0383740d3959941c4721a4 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/powerpc/boot/ns16550.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 60d9c5078532..ca146f17a014 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 884d04cd8d7bba3dc885227ad400f8aea5623cdc
+refs/heads/master: 2f0b45f846735b486c0383740d3959941c4721a4
diff --git a/trunk/arch/powerpc/boot/ns16550.c b/trunk/arch/powerpc/boot/ns16550.c
index aef3bdc89160..8c9ead94be06 100644
--- a/trunk/arch/powerpc/boot/ns16550.c
+++ b/trunk/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;
+	u32 reg_offset;
 
 	if (dt_get_virtual_reg(devp, (void **)&reg_base, 1) < 1)
 		return -1;
 
+	n = getprop(devp, "reg-offset", &reg_offset, sizeof(reg_offset));
+	if (n == sizeof(reg_offset))
+		reg_base += reg_offset;
+
 	n = getprop(devp, "reg-shift", &reg_shift, sizeof(reg_shift));
 	if (n != sizeof(reg_shift))
 		reg_shift = 0;