[linuxsh-cvs] CVS: linux/drivers/serial sh-sci.c, 1.47, 1.48 sh-sci.h, 1.23, 1.24

[Takashi Y. <yo...@us...>]

Update of /cvsroot/linuxsh/linux/drivers/serial
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27255/drivers/serial

Modified Files:
	sh-sci.c sh-sci.h 
Log Message:
SH7706 CPU support added


Index: sh-sci.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/serial/sh-sci.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- sh-sci.c	2 Aug 2006 06:18:15 -0000	1.47
+++ sh-sci.c	2 Aug 2006 14:40:09 -0000	1.48
@@ -293,7 +293,7 @@
 	sci_out(port, SCFCR, 0);
 }
 #elif defined(CONFIG_CPU_SH3)
-/* For SH7705, SH7707, SH7709, SH7709A, SH7729 */
+/* For SH7705, SH7706, SH7707, SH7709, SH7709A, SH7729 */
 static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
 {
 	unsigned int fcr_val = 0;

Index: sh-sci.h
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/serial/sh-sci.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- sh-sci.h	1 Aug 2006 04:16:11 -0000	1.23
+++ sh-sci.h	2 Aug 2006 14:40:09 -0000	1.24
@@ -28,7 +28,9 @@
 # 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)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7707) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7709) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7706)
 # 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 */
@@ -411,7 +413,9 @@
 		return ctrl_inb(SCSPTR)&0x01 ? 1 : 0; /* SCI */
 	return 1;
 }
-#elif defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7707) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7709) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7706)
 static inline int sci_rxd_in(struct uart_port *port)
 {
 	if (port->mapbase == 0xfffffe80)