Merge remote-tracking branch 'sh/sh-latest'

Conflicts:
	arch/sh/kernel/cpu/sh2a/Makefile
	drivers/tty/serial/sh-sci.c
	include/linux/serial_sci.h

diff --cc arch/sh/kernel/cpu/sh2a/Makefile
index 990195d9845607bfcca4a8b3cfcd05c41df582bc,130984caa6014c8fa09fd2a6164299d4252e8b5c..92f0da4c86a7533e18269e6f5d439130e1a71815
--- 1/arch/sh/kernel/cpu/sh2a/Makefile
--- 2/arch/sh/kernel/cpu/sh2a/Makefile
+++ b/arch/sh/kernel/cpu/sh2a/Makefile
@@@ -21,4 -21,5 +21,5 @@@ pinmux-$(CONFIG_CPU_SUBTYPE_SH7203)   := 
  pinmux-$(CONFIG_CPU_SUBTYPE_SH7264)   := pinmux-sh7264.o
  pinmux-$(CONFIG_CPU_SUBTYPE_SH7269)   := pinmux-sh7269.o
  
 -obj-$(CONFIG_GENERIC_GPIO)            += $(pinmux-y)
 +obj-$(CONFIG_GPIOLIB)                 += $(pinmux-y)
+ obj-$(CONFIG_HAVE_HW_BREAKPOINT)      += ubc.o

diff --cc drivers/tty/serial/sh-sci.c
index 537750261aaa2fe5a5e2de8fdb3e6ee0adf8fe4d,e3847cc2d995c2c4649f2fd3aeb0a7ade37537bf..d262c1f4af0377dfdfecf7d3e4fe8d9ef7a3fc00
--- 1/drivers/tty/serial/sh-sci.c
--- 2/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@@ -2481,9 -2502,20 +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/serial_sci.h
index 50fe651da965933f416b3cc6a5a0080942ac107e,857eec4336e39ea564516aba7bb66b0f459a63db..3dbdf7e53dcc0942153be0a59cdeebd73caa0973
--- 1/include/linux/serial_sci.h
--- 2/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@@ -16,7 -18,8 +18,9 @@@ enum 
        SCBRR_ALGO_3,           /* (((clk * 2) + 16 * bps) / (16 * bps) - 1) */
        SCBRR_ALGO_4,           /* (((clk * 2) + 16 * bps) / (32 * bps) - 1) */
        SCBRR_ALGO_5,           /* (((clk * 1000 / 32) / bps) - 1) */
 +      SCBRR_ALGO_6,           /* HSCIF variable sample rate algorithm */
+ 
+       SCBRR_NR_ALGOS,
  };
  
  #define SCSCR_TIE     (1 << 7)