Merge tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC late changes from Arnd Bergmann:
 "These are changes that arrived a little late before the merge window
  or that have multiple dependencies on previous branches so they did
  not fit into one of the earlier ones.  There are 10 branches merged
  here, a total of 39 non-merge commits.  Contents are a mixed bag for
  the above reasons:

   * Two new SoC platforms: ST microelectronics stixxxx and the TI
     'Nspire' graphing calculator.  These should have been in the 'soc'
     branch but were a little late
   * Support for the Exynos 5420 variant in mach-exynos, which is based
     on the other exynos branches to avoid conflicts.
   * Various small changes for sh-mobile, ux500 and davinci
   * Common clk support for MSM"

* tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
  ARM: ux500: bail out on alien cpus
  ARM: davinci: da850: adopt to pinctrl-single change for configuring multiple pins
  serial: sh-sci: Initialise variables before access in sci_set_termios()
  ARM: stih41x: Add B2020 board support
  ARM: stih41x: Add B2000 board support
  ARM: sti: Add DEBUG_LL console support
  ARM: sti: Add STiH416 SOC support
  ARM: sti: Add STiH415 SOC support
  ARM: msm: Migrate to common clock framework
  ARM: msm: Make proc_comm clock control into a platform driver
  ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver
  ARM: msm: Remove clock-7x30.h include file
  ARM: msm: Remove custom clk_set_{max,min}_rate() API
  ARM: msm: Remove custom clk_set_flags() API
  msm: iommu: Use clk_set_rate() instead of clk_set_min_rate()
  msm: iommu: Convert to clk_prepare/unprepare
  msm_sdcc: Convert to clk_prepare/unprepare
  usb: otg: msm: Convert to clk_prepare/unprepare
  msm_serial: Use devm_clk_get() and properly return errors
  msm_serial: Convert to clk_prepare/unprepare
  ...

diff --cc Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
Simple merge

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
index ab95f07e154131adb2faf54e5b72f8d1b8495c9a,b3ae502427bf42201d086e83421cf8600e5c9052..77c1411c9a91ab04132a847e2403cc500dc5a25b
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -330,38 -309,27 +330,52 @@@ choic
                  Say Y here if you want kernel low-level debugging support
                  on MVEBU based platforms.
  
 -      config DEBUG_NOMADIK_UART
 -              bool "Kernel low-level debugging messages via NOMADIK UART"
 -              depends on ARCH_NOMADIK
 -              help
 -                Say Y here if you want kernel low-level debugging support
 -                on NOMADIK based platforms.
 -
 +                This option should be used with the old bootloaders
 +                that left the internal registers mapped at
 +                0xd0000000. As of today, this is the case on
 +                platforms such as the Globalscale Mirabox or the
 +                Plathome OpenBlocks AX3, when using the original
 +                bootloader.
 +
 +                If the wrong DEBUG_MVEBU_UART* option is selected,
 +                when u-boot hands over to the kernel, the system
 +                silently crashes, with no serial output at all.
 +
 +      config DEBUG_MVEBU_UART_ALTERNATE
 +              bool "Kernel low-level debugging messages via MVEBU UART (new bootloaders)"
 +              depends on ARCH_MVEBU
 +              help
 +                Say Y here if you want kernel low-level debugging support
 +                on MVEBU based platforms.
 +
 +                This option should be used with the new bootloaders
 +                that remap the internal registers at 0xf1000000.
 +
 +                If the wrong DEBUG_MVEBU_UART* option is selected,
 +                when u-boot hands over to the kernel, the system
 +                silently crashes, with no serial output at all.
 +
 +      config DEBUG_NOMADIK_UART
 +              bool "Kernel low-level debugging messages via NOMADIK UART"
 +              depends on ARCH_NOMADIK
 +              help
 +                Say Y here if you want kernel low-level debugging support
 +                on NOMADIK based platforms.
 +
+       config DEBUG_NSPIRE_CLASSIC_UART
+               bool "Kernel low-level debugging via TI-NSPIRE 8250 UART"
+               depends on ARCH_NSPIRE
+               help
+                 Say Y here if you want kernel low-level debugging support
+                 on TI-NSPIRE classic models.
+ 
+       config DEBUG_NSPIRE_CX_UART
+               bool "Kernel low-level debugging via TI-NSPIRE PL011 UART"
+               depends on ARCH_NSPIRE
+               help
+                 Say Y here if you want kernel low-level debugging support
+                 on TI-NSPIRE CX models.
+ 
        config DEBUG_OMAP2PLUS_UART
                bool "Kernel low-level debugging messages via OMAP2PLUS UART"
                depends on ARCH_OMAP2PLUS
@@@ -718,24 -679,21 +766,27 @@@ config DEBUG_LL_INCLUD
                                 DEBUG_IMX35_UART || \
                                 DEBUG_IMX51_UART || \
                                 DEBUG_IMX53_UART ||\
 -                               DEBUG_IMX6Q_UART
 -      default "debug/mvebu.S" if DEBUG_MVEBU_UART
 -      default "debug/nspire.S" if     DEBUG_NSPIRE_CX_UART || \
 -                                      DEBUG_NSPIRE_CLASSIC_UART
 +                               DEBUG_IMX6Q_UART || \
 +                               DEBUG_IMX6SL_UART
 +      default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 || \
 +                                    DEBUG_KEYSTONE_UART1
 +      default "debug/mvebu.S" if DEBUG_MVEBU_UART || \
 +                                 DEBUG_MVEBU_UART_ALTERNATE
        default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
        default "debug/nomadik.S" if DEBUG_NOMADIK_UART
++      default "debug/nspire.S" if     DEBUG_NSPIRE_CX_UART || \
++                                      DEBUG_NSPIRE_CLASSIC_UART
        default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
        default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
        default "debug/pxa.S" if DEBUG_PXA_UART1 || DEBUG_MMP_UART2 || \
                                 DEBUG_MMP_UART3
 +      default "debug/rockchip.S" if DEBUG_ROCKCHIP_UART
        default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
        default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
+       default "debug/sti.S" if DEBUG_STI_UART
        default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
        default "debug/tegra.S" if DEBUG_TEGRA_UART
 +      default "debug/u300.S" if DEBUG_U300_UART
        default "debug/ux500.S" if DEBUG_UX500_UART
        default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
                DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/exynos5250.dtsi
Simple merge

diff --cc arch/arm/mach-exynos/Kconfig
Simple merge

diff --cc arch/arm/mach-exynos/common.c
Simple merge

diff --cc arch/arm/mach-exynos/include/mach/uncompress.h
Simple merge

diff --cc arch/arm/mach-exynos/mach-exynos5-dt.c
Simple merge

diff --cc arch/arm/mach-exynos/platsmp.c
Simple merge

diff --cc arch/arm/mach-msm/Makefile
Simple merge

diff --cc drivers/pinctrl/pinctrl-samsung.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-samsung.h
index 79fcc2076c00d4919df10def1474a5f1cda10bf3,d45caf02b37252771806c6e2ee0b808134a3aa14..11bb75ba81a949e9bf33caa04e97847c494e905f
--- 1/drivers/pinctrl/pinctrl-samsung.h
--- 2/drivers/pinctrl/pinctrl-samsung.h
+++ b/drivers/pinctrl/pinctrl-samsung.h
@@@ -254,10 -254,7 +254,11 @@@ struct samsung_pmx_func 
  extern struct samsung_pin_ctrl exynos4210_pin_ctrl[];
  extern struct samsung_pin_ctrl exynos4x12_pin_ctrl[];
  extern struct samsung_pin_ctrl exynos5250_pin_ctrl[];
+ extern struct samsung_pin_ctrl exynos5420_pin_ctrl[];
  extern struct samsung_pin_ctrl s3c64xx_pin_ctrl[];
 +extern struct samsung_pin_ctrl s3c2412_pin_ctrl[];
 +extern struct samsung_pin_ctrl s3c2416_pin_ctrl[];
 +extern struct samsung_pin_ctrl s3c2440_pin_ctrl[];
 +extern struct samsung_pin_ctrl s3c2450_pin_ctrl[];
  
  #endif /* __PINCTRL_SAMSUNG_H */

diff --cc drivers/tty/serial/samsung.c
Simple merge

diff --cc include/uapi/linux/serial_core.h
index c8eaeb5465ef76e4ec8992f45e6523a72ebc258c,26eee07eeb246ce06eac5c37ced79c3e8765862b..9119cc0977bf42a36f2ae8aa51123c99b0b5f9d7
--- 1/include/uapi/linux/serial_core.h
--- 2/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@@ -226,7 -226,7 +226,10 @@@
  /* Rocketport EXPRESS/INFINITY */
  #define PORT_RP2      102
  
 -#define PORT_HSCIF    103
 +/* Freescale lpuart */
 +#define PORT_LPUART   103
 +
+ /* SH-SCI */
++#define PORT_HSCIF    104
+ 
  #endif /* _UAPILINUX_SERIAL_CORE_H */