Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

Conflicts:
	drivers/tty/serial/sh-sci.c

Signed-off-by: Paul Mundt <[email protected]>

diff --combined drivers/tty/serial/sh-sci.c
index ffcaceee0215389bfbca4bbfbb0867eb0259f219,2ec57b2fb2783a232df5aad9df1a276a6f2edd1e..18e6342af07379e71f966c67656cca803925f76c
--- 1/drivers/tty/serial/sh-sci.c
--- 2/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@@ -47,7 -47,6 +47,7 @@@
  #include <linux/ctype.h>
  #include <linux/err.h>
  #include <linux/dmaengine.h>
 +#include <linux/dma-mapping.h>
  #include <linux/scatterlist.h>
  #include <linux/slab.h>
  
@@@ -96,12 -95,6 +96,12 @@@ struct sci_port 
  #endif
  
        struct notifier_block           freq_transition;
 +
 +#ifdef CONFIG_SERIAL_SH_SCI_CONSOLE
 +      unsigned short saved_smr;
 +      unsigned short saved_fcr;
 +      unsigned char saved_brr;
 +#endif
  };
  
  /* Function prototypes */
@@@ -1640,25 -1633,11 +1640,25 @@@ static unsigned int sci_scbrr_calc(unsi
        return ((freq + 16 * bps) / (32 * bps) - 1);
  }
  
 +static void sci_reset(struct uart_port *port)
 +{
 +      unsigned int status;
 +
 +      do {
 +              status = sci_in(port, SCxSR);
 +      } while (!(status & SCxSR_TEND(port)));
 +
 +      sci_out(port, SCSCR, 0x00);     /* TE=0, RE=0, CKE1=0 */
 +
 +      if (port->type != PORT_SCI)
 +              sci_out(port, SCFCR, SCFCR_RFRST | SCFCR_TFRST);
 +}
 +
  static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
                            struct ktermios *old)
  {
        struct sci_port *s = to_sci_port(port);
 -      unsigned int status, baud, smr_val, max_baud;
 +      unsigned int baud, smr_val, max_baud;
        int t = -1;
        u16 scfcr = 0;
  
@@@ -1678,7 -1657,14 +1678,7 @@@
  
        sci_port_enable(s);
  
 -      do {
 -              status = sci_in(port, SCxSR);
 -      } while (!(status & SCxSR_TEND(port)));
 -
 -      sci_out(port, SCSCR, 0x00);     /* TE=0, RE=0, CKE1=0 */
 -
 -      if (port->type != PORT_SCI)
 -              sci_out(port, SCFCR, scfcr | SCFCR_RFRST | SCFCR_TFRST);
 +      sci_reset(port);
  
        smr_val = sci_in(port, SCSMR) & 3;
  
@@@ -1903,7 -1889,7 +1903,7 @@@ static int __devinit sci_init_single(st
  
        if (p->regtype == SCIx_PROBE_REGTYPE) {
                ret = sci_probe_regmap(p);
-               if (unlikely(ret != 0))
+               if (unlikely(ret))
                        return ret;
        }
  
@@@ -2050,8 -2036,7 +2050,8 @@@ static int __devinit serial_console_set
        if (options)
                uart_parse_options(options, &baud, &parity, &bits, &flow);
  
 -      /* TODO: disable clock */
 +      sci_port_disable(sci_port);
 +
        return uart_set_options(port, co, baud, parity, bits, flow);
  }
  
@@@ -2094,36 -2079,6 +2094,36 @@@ static int __devinit sci_probe_earlypri
        return 0;
  }
  
 +#define uart_console(port)    ((port)->cons->index == (port)->line)
 +
 +static int sci_runtime_suspend(struct device *dev)
 +{
 +      struct sci_port *sci_port = dev_get_drvdata(dev);
 +      struct uart_port *port = &sci_port->port;
 +
 +      if (uart_console(port)) {
 +              sci_port->saved_smr = sci_in(port, SCSMR);
 +              sci_port->saved_brr = sci_in(port, SCBRR);
 +              sci_port->saved_fcr = sci_in(port, SCFCR);
 +      }
 +      return 0;
 +}
 +
 +static int sci_runtime_resume(struct device *dev)
 +{
 +      struct sci_port *sci_port = dev_get_drvdata(dev);
 +      struct uart_port *port = &sci_port->port;
 +
 +      if (uart_console(port)) {
 +              sci_reset(port);
 +              sci_out(port, SCSMR, sci_port->saved_smr);
 +              sci_out(port, SCBRR, sci_port->saved_brr);
 +              sci_out(port, SCFCR, sci_port->saved_fcr);
 +              sci_out(port, SCSCR, sci_port->cfg->scscr);
 +      }
 +      return 0;
 +}
 +
  #define SCI_CONSOLE   (&serial_console)
  
  #else
@@@ -2133,8 -2088,6 +2133,8 @@@ static inline int __devinit sci_probe_e
  }
  
  #define SCI_CONSOLE   NULL
 +#define sci_runtime_suspend   NULL
 +#define sci_runtime_resume    NULL
  
  #endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
  
@@@ -2250,8 -2203,6 +2250,8 @@@ static int sci_resume(struct device *de
  }
  
  static const struct dev_pm_ops sci_dev_pm_ops = {
 +      .runtime_suspend = sci_runtime_suspend,
 +      .runtime_resume = sci_runtime_resume,
        .suspend        = sci_suspend,
        .resume         = sci_resume,
  };