Merge remote-tracking branch 'tty/tty-next'

Conflicts:
	drivers/tty/serial/Makefile
	drivers/tty/serial/sh-sci.c
	include/linux/of.h
	include/uapi/linux/serial_core.h

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc drivers/tty/serial/Kconfig
Simple merge

diff --cc drivers/tty/serial/Makefile
index 3d0f097e82ff51b3e34c8cb80e467d70c07dfb34,47b679c547e9a86d78a0a13114739422f11ae036..240e62953e1dd53a84765023c2a9bdd013f7722b
--- 1/drivers/tty/serial/Makefile
--- 2/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@@ -65,7 -65,7 +65,8 @@@ obj-$(CONFIG_SERIAL_KGDB_NMI) += kgdb_n
  obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
  obj-$(CONFIG_SERIAL_OMAP) += omap-serial.o
  obj-$(CONFIG_SERIAL_ALTERA_UART) += altera_uart.o
 +obj-$(CONFIG_SERIAL_TILEGX) += tilegx.o
+ obj-$(CONFIG_SERIAL_ST_ASC) += st-asc.o
  obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o
  obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
  obj-$(CONFIG_SERIAL_TIMBERDALE)       += timbuart.o

diff --cc drivers/tty/serial/sh-sci.c
index 5ef9300b04669d22a04263950dd51e25262b2d6a,537750261aaa2fe5a5e2de8fdb3e6ee0adf8fe4d..d262c1f4af0377dfdfecf7d3e4fe8d9ef7a3fc00
--- 1/drivers/tty/serial/sh-sci.c
--- 2/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@@ -2588,20 -2481,9 +2588,20 @@@ static int sci_probe(struct platform_de
        if (is_early_platform_device(dev))
                return sci_probe_earlyprintk(dev);
  
-               p = dev->dev.platform_data;
 +      if (dev->dev.of_node)
 +              p = sci_parse_dt(dev, &dev_id);
 +      else
++              p = dev_get_platdata(&dev->dev);
 +
 +      if (!p) {
 +              dev_err(&dev->dev, "no setup data supplied\n");
 +              return -EINVAL;
 +      }
 +
 +      sp = &sci_ports[dev_id];
        platform_set_drvdata(dev, sp);
  
 -      ret = sci_probe_single(dev, dev->id, p, sp);
 +      ret = sci_probe_single(dev, dev_id, p, sp);
        if (ret)
                return ret;
  

diff --cc include/linux/of.h
index 90a8811e9e480285fe417e6c4e4b6c9c4425166a,429e16801858d772ad509d75b66b064d4b728560..17ce8a6b154e772bb5a0318cadcbd0baf92282f2
--- 1/include/linux/of.h
--- 2/include/linux/of.h
+++ b/include/linux/of.h
@@@ -331,7 -337,14 +331,9 @@@ const __be32 *of_prop_next_u32(struct p
   *         printk("String value: %s\n", s);
   */
  const char *of_prop_next_string(struct property *prop, const char *cur);
 -#define of_property_for_each_string(np, propname, prop, s)    \
 -      for (prop = of_find_property(np, propname, NULL),       \
 -              s = of_prop_next_string(prop, NULL);            \
 -              s;                                              \
 -              s = of_prop_next_string(prop, s))
  
+ int of_device_is_stdout_path(struct device_node *dn);
+ 
  #else /* CONFIG_OF */
  
  static inline const char* of_node_full_name(struct device_node *np)
@@@ -494,20 -507,17 +496,25 @@@ static inline int of_machine_is_compati
        return 0;
  }
  
 +static inline const __be32 *of_prop_next_u32(struct property *prop,
 +              const __be32 *cur, u32 *pu)
 +{
 +      return NULL;
 +}
 +
 +static inline const char *of_prop_next_string(struct property *prop,
 +              const char *cur)
 +{
 +      return NULL;
 +}
 +
+ static inline int of_device_is_stdout_path(struct device_node *dn)
+ {
+       return 0;
+ }
+ 
  #define of_match_ptr(_ptr)    NULL
  #define of_match_node(_matches, _node)        NULL
 -#define of_property_for_each_u32(np, propname, prop, p, u) \
 -      while (0)
 -#define of_property_for_each_string(np, propname, prop, s) \
 -      while (0)
  #endif /* CONFIG_OF */
  
  #ifndef of_node_to_nid

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc include/uapi/linux/serial_core.h
index b466487bb5da4917800647af6a040376f1bd2070,e40ebe124cedff75cae654adb6658d0d0bfe3ea6..5a8b6fe5c975544441de8996df402238bca33a94
--- 1/include/uapi/linux/serial_core.h
--- 2/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@@ -232,7 -232,7 +232,10 @@@
  /* SH-SCI */
  #define PORT_HSCIF    104
  
 -#define PORT_ASC       105
 +/* Tilera TILE-Gx UART */
 +#define PORT_TILEGX   105
 +
+ /* ST ASC type numbers */
++#define PORT_ASC       106
+ 
  #endif /* _UAPILINUX_SERIAL_CORE_H */