Merge branch 'imx/imx6q' into next/soc

Conflicts:
	Documentation/devicetree/bindings/arm/fsl.txt
	arch/arm/Kconfig
	arch/arm/Kconfig.debug
	arch/arm/plat-mxc/include/mach/common.h

1 files changed, 112 insertions, 12 deletions

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 4bb7eb90f070..c865b9271364 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -135,6 +135,118 @@ choice
                   Say Y here if you want the debug print routines to direct
                   their output to the UART on Highbank based devices.
 
+        config DEBUG_IMX1_UART
+                bool "i.MX1 Debug UART"
+                depends on SOC_IMX1
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX1.
+
+        config DEBUG_IMX23_UART
+                bool "i.MX23 Debug UART"
+                depends on SOC_IMX23
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX23.
+
+        config DEBUG_IMX25_UART
+                bool "i.MX25 Debug UART"
+                depends on SOC_IMX25
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX25.
+
+        config DEBUG_IMX21_IMX27_UART
+                bool "i.MX21 and i.MX27 Debug UART"
+                depends on SOC_IMX21 || SOC_IMX27
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX21 or i.MX27.
+
+        config DEBUG_IMX28_UART
+                bool "i.MX28 Debug UART"
+                depends on SOC_IMX28
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX28.
+
+        config DEBUG_IMX31_IMX35_UART
+                bool "i.MX31 and i.MX35 Debug UART"
+                depends on SOC_IMX31 || SOC_IMX35
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX31 or i.MX35.
+
+        config DEBUG_IMX51_UART
+                bool "i.MX51 Debug UART"
+                depends on SOC_IMX51
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX51.
+
+        config DEBUG_IMX50_IMX53_UART
+                bool "i.MX50 and i.MX53 Debug UART"
+                depends on SOC_IMX50 || SOC_IMX53
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX50 or i.MX53.
+
+        config DEBUG_IMX6Q_UART
+                bool "i.MX6Q Debug UART"
+                depends on SOC_IMX6Q
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX6Q.
+
+        config DEBUG_S3C_UART0
+                depends on PLAT_SAMSUNG
+                bool "Use S3C UART 0 for low-level debug"
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to UART 0. The port must have been initialised
+                  by the boot-loader before use.
+
+                  The uncompressor code port configuration is now handled
+                  by CONFIG_S3C_LOWLEVEL_UART_PORT.
+
+        config DEBUG_S3C_UART1
+                depends on PLAT_SAMSUNG
+                bool "Use S3C UART 1 for low-level debug"
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to UART 1. The port must have been initialised
+                  by the boot-loader before use.
+
+                  The uncompressor code port configuration is now handled
+                  by CONFIG_S3C_LOWLEVEL_UART_PORT.
+
+        config DEBUG_S3C_UART2
+                depends on PLAT_SAMSUNG
+                bool "Use S3C UART 2 for low-level debug"
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to UART 2. The port must have been initialised
+                  by the boot-loader before use.
+
+                  The uncompressor code port configuration is now handled
+                  by CONFIG_S3C_LOWLEVEL_UART_PORT.
+
+        config DEBUG_REALVIEW_STD_PORT
+                bool "RealView Default UART"
+                depends on ARCH_REALVIEW
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to the serial port on RealView EB, PB11MP, PBA8
+                  and PBX platforms.
+
+        config DEBUG_REALVIEW_PB1176_PORT
+                bool "RealView PB1176 UART"
+                depends on MACH_REALVIEW_PB1176
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to the standard serial port on the RealView
+                  PB1176 platform.
+
 endchoice
 
 config EARLY_PRINTK
@@ -153,18 +265,6 @@ config OC_ETM
           buffer driver that will allow you to collect traces of the
           kernel code.
 
-config DEBUG_S3C_UART
-        depends on PLAT_SAMSUNG
-        int "S3C UART to use for low-level debug"
-        default "0"
-        help
-          Choice for UART for kernel low-level using S3C UARTS,
-          should be between zero and two. The port must have been
-          initialised by the boot-loader before use.
-
-          The uncompressor code port configuration is now handled
-          by CONFIG_S3C_LOWLEVEL_UART_PORT.
-
 config ARM_KPROBES_TEST
         tristate "Kprobes test module"
         depends on KPROBES && MODULES