Skip to contentSkip to conversation

sh: Add sci_rxd_in of SH4-202

PATCH Applied Nobuhiro Iwamatsu 2 participants 2 messages Oct 29, 2008 – Oct 31, 2008 SuperH

lore
Share & tools
lore

Nobuhiro Iwamatsu

author
#0 lore raw

PATCH 1/1 sh: Add sci_rxd_in of SH4-202

SH4-202 doesn't have SCSXX1. But it is treated so that there is SCSPTR1 in current code. This patch add sci_rxd_in of SH4-202.

Signed-off-by Nobuhiro Iwamatsu <[email protected]>
---
 drivers/serial/sh-sci.h |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
drivers/serial/sh-sci.h +8 -2
index 257b223..cd4073e 100644
@@ -526,8 +526,7 @@ static inline int sci_rxd_in(struct uart_port *port)
       defined(CONFIG_CPU_SUBTYPE_SH7751R) || \
       defined(CONFIG_CPU_SUBTYPE_SH7750R) || \
       defined(CONFIG_CPU_SUBTYPE_SH7750S) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7091)  || \
-      defined(CONFIG_CPU_SUBTYPE_SH4_202)
+      defined(CONFIG_CPU_SUBTYPE_SH7091)
 static inline int sci_rxd_in(struct uart_port *port)
 {
 	if (port->mapbase = 0xffe00000)

@@ -536,6 +535,13 @@ static inline int sci_rxd_in(struct uart_port *port)
 		return ctrl_inw(SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */
 	return 1;
 }
+#elif defined(CONFIG_CPU_SUBTYPE_SH4_202)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+	if (port->mapbase = 0xffe80000)
+		return ctrl_inw(SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */
+	return 1;
+}
 #elif defined(CONFIG_CPU_SUBTYPE_SH7760)
 static inline int sci_rxd_in(struct uart_port *port)
 {
Signature · 1 line
1.5.6.5
Applied
#1 lore raw
Quoted 4 lines · Nobuhiro Iwamatsu

SH4-202 doesn't have SCSXX1. But it is treated so that there is SCSPTR1 in current code. This patch add sci_rxd_in of SH4-202.

Signed-off-by Nobuhiro Iwamatsu <[email protected]>
Quoted 4 lines · Nobuhiro Iwamatsu

This change a name of SCSPTR used in sci_rxd_in of SH5-101. SCSPTR is not declared and will become the error.

Signed-off-by Nobuhiro Iwamatsu <[email protected]>

Applied, thanks.