Merge remote-tracking branch 'imx-mxs/for-next'

Conflicts:
	arch/arm/Kconfig.debug
	arch/arm/mach-mxs/mach-mxs.c

diff --cc arch/arm/Kconfig.debug
index 4649bf5b05d3089800771bbf71df40d748206c2a,29f7623553c195703e0cd1a610cb5ec4165c4ae1..003f371d0f0bdc3134dac728899d57e770c8705e
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -251,20 -251,13 +251,27 @@@ choic
                  Say Y here if you want kernel low-level debugging support
                  on i.MX6Q/DL.
  
+       config DEBUG_IMX6SL_UART
+               bool "i.MX6SL Debug UART"
+               depends on SOC_IMX6SL
+               help
+                 Say Y here if you want kernel low-level debugging support
+                 on i.MX6SL.
+ 
 +      config DEBUG_KEYSTONE_UART0
 +              bool "Kernel low-level debugging on KEYSTONE2 using UART0"
 +              depends on ARCH_KEYSTONE
 +              help
 +                Say Y here if you want the debug print routines to direct
 +                their output to UART0 serial port on KEYSTONE2 devices.
 +
 +      config DEBUG_KEYSTONE_UART1
 +              bool "Kernel low-level debugging on KEYSTONE2 using UART1"
 +              depends on ARCH_KEYSTONE
 +              help
 +                Say Y here if you want the debug print routines to direct
 +                their output to UART1 serial port on KEYSTONE2 devices.
 +
        config DEBUG_MMP_UART2
                bool "Kernel low-level debugging message via MMP UART2"
                depends on ARCH_MMP
@@@ -677,11 -639,9 +685,12 @@@ config DEBUG_LL_INCLUD
                                 DEBUG_IMX35_UART || \
                                 DEBUG_IMX51_UART || \
                                 DEBUG_IMX53_UART ||\
-                                DEBUG_IMX6Q_UART
+                                DEBUG_IMX6Q_UART || \
+                                DEBUG_IMX6SL_UART
 -      default "debug/mvebu.S" if DEBUG_MVEBU_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/omap2plus.S" if DEBUG_OMAP2PLUS_UART

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

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

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

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

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

diff --cc arch/arm/mach-imx/mm-imx3.c
Simple merge

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

diff --cc arch/arm/mach-mxs/mach-mxs.c
index d67ecc1c884787837719d79809057c9c28ef8bec,ba227cb2c93bf41eabe3810d8bc4586c4b154b36..7fa611c1b287a846b95ff5b972f178c9a3ba9598
--- 1/arch/arm/mach-mxs/mach-mxs.c
--- 2/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@@ -434,7 -544,7 +544,6 @@@ static const char *mxs_dt_compat[] __in
  };
  
  DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)")
-       .init_irq       = irqchip_init,
 -      .map_io         = debug_ll_io_init,
        .handle_irq     = icoll_handle_irq,
        .init_time      = mxs_timer_init,
        .init_machine   = mxs_machine_init,

diff --cc drivers/bus/Kconfig
Simple merge

diff --cc drivers/bus/Makefile
Simple merge