Merge branch 'rmobile/urgent' into rmobile-latest

Conflicts:
	arch/arm/mach-shmobile/include/mach/entry-macro.S

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

3 files changed, 11 insertions, 18 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 4d8e14b7aa93..09a550860dcf 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2872,7 +2872,7 @@ static struct console serial8250_console = {
         .device         = uart_console_device,
         .setup          = serial8250_console_setup,
         .early_setup    = serial8250_console_early_setup,
-        .flags          = CON_PRINTBUFFER,
+        .flags          = CON_PRINTBUFFER | CON_ANYTIME,
         .index          = -1,
         .data           = &serial8250_reg,
 };
diff --git a/drivers/serial/kgdboc.c b/drivers/serial/kgdboc.c
index 3374618300af..25a8bc565f40 100644
--- a/drivers/serial/kgdboc.c
+++ b/drivers/serial/kgdboc.c
@@ -90,7 +90,8 @@ static DECLARE_WORK(kgdboc_restore_input_work, kgdboc_restore_input_helper);
 
 static void kgdboc_restore_input(void)
 {
-        schedule_work(&kgdboc_restore_input_work);
+        if (likely(system_state == SYSTEM_RUNNING))
+                schedule_work(&kgdboc_restore_input_work);
 }
 
 static int kgdboc_register_kbd(char **cptr)
diff --git a/drivers/serial/mfd.c b/drivers/serial/mfd.c
index 5fc699e929dc..d40010a22ecd 100644
--- a/drivers/serial/mfd.c
+++ b/drivers/serial/mfd.c
@@ -900,8 +900,7 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios,
         unsigned char cval, fcr = 0;
         unsigned long flags;
         unsigned int baud, quot;
-        u32 mul = 0x3600;
-        u32 ps = 0x10;
+        u32 ps, mul;
 
         switch (termios->c_cflag & CSIZE) {
         case CS5:
@@ -943,31 +942,24 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios,
         baud = uart_get_baud_rate(port, termios, old, 0, 4000000);
 
         quot = 1;
+        ps = 0x10;
+        mul = 0x3600;
         switch (baud) {
         case 3500000:
                 mul = 0x3345;
                 ps = 0xC;
                 break;
-        case 3000000:
-                mul = 0x2EE0;
-                break;
-        case 2500000:
-                mul = 0x2710;
-                break;
-        case 2000000:
-                mul = 0x1F40;
-                break;
         case 1843200:
                 mul = 0x2400;
                 break;
+        case 3000000:
+        case 2500000:
+        case 2000000:
         case 1500000:
-                mul = 0x1770;
-                break;
         case 1000000:
-                mul = 0xFA0;
-                break;
         case 500000:
-                mul = 0x7D0;
+                /* mul/ps/quot = 0x9C4/0x10/0x1 will make a 500000 bps */
+                mul = baud / 500000 * 0x9C4;
                 break;
         default:
                 /* Use uart_get_divisor to get quot for other baud rates */