From: Magnus Damm <magnus.damm@gmail.com>
Date: Wed, 23 Apr 2008 12:31:14 +0000 (+0900)
Subject: sh-sci: sh7722 lacks scsptr registers
X-Git-Tag: v2.6.26-rc2~14^2~10
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b4e466f93c6b614d05139d84a930a55fe4cd781;p=linux-2.6

sh-sci: sh7722 lacks scsptr registers

The sh7722 serial ports all lack SCSPTR registers, so mark them as
nonexistent in the register table.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h
index 4d1c0e328a..b0dac379de 100644
--- a/drivers/serial/sh-sci.h
+++ b/drivers/serial/sh-sci.h
@@ -452,7 +452,11 @@ SCIF_FNS(SCSPTR,			0,  0, 0x24, 16)
 SCIF_FNS(SCLSR,				0,  0, 0x28, 16)
 #else
 SCIF_FNS(SCFDR,                      0x0e, 16, 0x1C, 16)
+#if defined(CONFIG_CPU_SUBTYPE_SH7722)
+SCIF_FNS(SCSPTR,                        0,  0, 0, 0)
+#else
 SCIF_FNS(SCSPTR,                        0,  0, 0x20, 16)
+#endif
 SCIF_FNS(SCLSR,                         0,  0, 0x24, 16)
 #endif
 #endif