sh: sh-sci - fix SH7708 support

[Magnus D. <mag...@gm...>]

sh: sh-sci - fix SH7708 support

This patch makes sure the sci serial port driver compiles for sh7708. The
approach taken is to treat the sh7708 as a subset of sh7706, sh7707, sh7709.
sh7708 is very similar to sh7706, sh7707, sh7709, but only equipped with
a single sci port. The platform data in setup-sh770x.c already limits the
number of serial ports for sh7708 to a single one, so the non-existing scif
ports pointed out in sh-sci.h will remain unused in case of sh7708.

Signed-off-by: Magnus Damm <da...@ig...>
---

 drivers/serial/sh-sci.h |   25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

--- 0001/drivers/serial/sh-sci.h
+++ work/drivers/serial/sh-sci.h	2007-07-25 21:35:47.000000000 +0900
@@ -24,13 +24,10 @@
 #endif
 #endif
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7708)
-# define SCSPTR 0xffffff7c /* 8 bit */
-# define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
-# define SCI_ONLY
-#elif defined(CONFIG_CPU_SUBTYPE_SH7707) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7709) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7706)
+#if defined(CONFIG_CPU_SUBTYPE_SH7706) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7707) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7708) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7709)
 # define SCPCR  0xA4000116 /* 16 bit SCI and SCIF */
 # define SCPDR  0xA4000136 /* 8  bit SCI and SCIF */
 # define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
@@ -473,16 +470,10 @@ static const struct __attribute__((packe
 };
 #endif
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7708)
-static inline int sci_rxd_in(struct uart_port *port)
-{
-	if (port->mapbase == 0xfffffe80)
-		return ctrl_inb(SCSPTR)&0x01 ? 1 : 0; /* SCI */
-	return 1;
-}
-#elif defined(CONFIG_CPU_SUBTYPE_SH7707) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7709) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7706)
+#if defined(CONFIG_CPU_SUBTYPE_SH7706) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7707) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7708) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7709)
 static inline int sci_rxd_in(struct uart_port *port)
 {
 	if (port->mapbase == 0xfffffe80)