Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

2 files changed, 36 insertions, 5 deletions

diff --git a/drivers/serial/suncore.c b/drivers/serial/suncore.c
index 5fc4a62173d9..fa4ae94243c2 100644
--- a/drivers/serial/suncore.c
+++ b/drivers/serial/suncore.c
@@ -34,6 +34,7 @@ sunserial_console_termios(struct console *con)
         char *mode_prop = "ttyX-mode";
         char *cd_prop = "ttyX-ignore-cd";
         char *dtr_prop = "ttyX-rts-dtr-off";
+        char *ssp_console_modes_prop = "ssp-console-modes";
         int baud, bits, stop, cflag;
         char parity;
         int carrier = 0;
@@ -43,14 +44,39 @@ sunserial_console_termios(struct console *con)
         if (!serial_console)
                 return;
 
-        if (serial_console == 1) {
+        switch (serial_console) {
+        case PROMDEV_OTTYA:
                 mode_prop[3] = 'a';
                 cd_prop[3] = 'a';
                 dtr_prop[3] = 'a';
-        } else {
+                break;
+
+        case PROMDEV_OTTYB:
                 mode_prop[3] = 'b';
                 cd_prop[3] = 'b';
                 dtr_prop[3] = 'b';
+                break;
+
+        case PROMDEV_ORSC:
+
+                nd = prom_pathtoinode("rsc");
+                if (!nd) {
+                        strcpy(mode, "115200,8,n,1,-");
+                        goto no_options;
+                }
+
+                if (!prom_node_has_property(nd, ssp_console_modes_prop)) {
+                        strcpy(mode, "115200,8,n,1,-");
+                        goto no_options;
+                }
+
+                memset(mode, 0, sizeof(mode));
+                prom_getstring(nd, ssp_console_modes_prop, mode, sizeof(mode));
+                goto no_options;
+
+        default:
+                strcpy(mode, "9600,8,n,1,-");
+                goto no_options;
         }
 
         topnd = prom_getchild(prom_root_node);
@@ -110,6 +136,10 @@ no_options:
                 case 9600: cflag |= B9600; break;
                 case 19200: cflag |= B19200; break;
                 case 38400: cflag |= B38400; break;
+                case 57600: cflag |= B57600; break;
+                case 115200: cflag |= B115200; break;
+                case 230400: cflag |= B230400; break;
+                case 460800: cflag |= B460800; break;
                 default: baud = 9600; cflag |= B9600; break;
         }
 
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index 7e773ff76c61..8bcaebcc0ad7 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -897,9 +897,6 @@ static int sunsab_console_setup(struct console *con, char *options)
 
         sunserial_console_termios(con);
 
-        /* Firmware console speed is limited to 150-->38400 baud so
-         * this hackish cflag thing is OK.
-         */
         switch (con->cflag & CBAUD) {
         case B150: baud = 150; break;
         case B300: baud = 300; break;
@@ -910,6 +907,10 @@ static int sunsab_console_setup(struct console *con, char *options)
         default: case B9600: baud = 9600; break;
         case B19200: baud = 19200; break;
         case B38400: baud = 38400; break;
+        case B57600: baud = 57600; break;
+        case B115200: baud = 115200; break;
+        case B230400: baud = 230400; break;
+        case B460800: baud = 460800; break;
         };
 
         /*