1 files changed, 18 insertions, 22 deletions

diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 969106187718..ce6ee92b3a1b 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -42,14 +42,12 @@
 #include <linux/console.h>
 #include <linux/platform_device.h>
 #include <linux/serial_sci.h>
-
-#ifdef CONFIG_CPU_FREQ
 #include <linux/notifier.h>
 #include <linux/cpufreq.h>
-#endif
-
-#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
+#include <linux/clk.h>
 #include <linux/ctype.h>
+
+#ifdef CONFIG_SUPERH
 #include <asm/clock.h>
 #include <asm/sh_bios.h>
 #include <asm/kgdb.h>
@@ -80,7 +78,7 @@ struct sci_port {
         struct timer_list       break_timer;
         int                     break_flag;
 
-#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
+#ifdef CONFIG_SUPERH
         /* Port clock */
         struct clk              *clk;
 #endif
@@ -186,15 +184,15 @@ static void put_string(struct sci_port *sci_port, const char *buffer, int count)
                         int h, l;
 
                         c = *p++;
-                        h = highhex(c);
-                        l = lowhex(c);
+                        h = hex_asc_hi(c);
+                        l = hex_asc_lo(c);
                         put_char(port, h);
                         put_char(port, l);
                         checksum += h + l;
                 }
                 put_char(port, '#');
-                put_char(port, highhex(checksum));
-                put_char(port, lowhex(checksum));
+                put_char(port, hex_asc_hi(checksum));
+                put_char(port, hex_asc_lo(checksum));
             } while  (get_char(port) != '+');
         } else
 #endif /* CONFIG_SH_STANDARD_BIOS || CONFIG_SH_KGDB */
@@ -365,21 +363,19 @@ static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
 static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
 {
         unsigned int fcr_val = 0;
+        unsigned short data;
 
-        if (cflag & CRTSCTS) {
-                fcr_val |= SCFCR_MCE;
-
-                ctrl_outw(0x0000, PORT_PSCR);
-        } else {
-                unsigned short data;
-
-                data = ctrl_inw(PORT_PSCR);
-                data &= 0x033f;
-                data |= 0x0400;
-                ctrl_outw(data, PORT_PSCR);
+        if (port->mapbase == 0xffe00000) {
+                data = ctrl_inw(PSCR);
+                data &= ~0x03cf;
+                if (cflag & CRTSCTS)
+                        fcr_val |= SCFCR_MCE;
+                else
+                        data |= 0x0340;
 
-                ctrl_outw(ctrl_inw(SCSPTR0) & 0x17, SCSPTR0);
+                ctrl_outw(data, PSCR);
         }
+        /* SCIF1 and SCIF2 should be setup by board code */
 
         sci_out(port, SCFCR, fcr_val);
 }