Merge branch 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6 into...

* 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6: (3 commits)
  ARM: imx6q: add cko1 clock
  ARM: mxc: make imx_dma_is_general_purpose more generic for sdma
  ARM: imx6: Rename DEBUG_IMX6Q_UART to UART4

diff --cc arch/arm/Kconfig.debug
index b895a2a92da8186f5eda5aa04a5ee9ee51410cd1,87abb5d3faf1b47f2296f3e3de89c06db46c20b2..66ca8014ff3e6648fcb353923e39ee4663d3edc4
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -185,44 -204,40 +185,44 @@@ choic
                depends on SOC_IMX6Q
                help
                  Say Y here if you want kernel low-level debugging support
-                 on i.MX6Q.
+                 on i.MX6Q UART4.
  
 -      config DEBUG_S3C_UART0
 -              depends on PLAT_SAMSUNG
 -              bool "Use S3C UART 0 for low-level debug"
 +      config DEBUG_MSM_UART1
 +              bool "Kernel low-level debugging messages via MSM UART1"
 +              depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
                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.
 +                their output to the first serial port on MSM devices.
  
 -      config DEBUG_S3C_UART1
 -              depends on PLAT_SAMSUNG
 -              bool "Use S3C UART 1 for low-level debug"
 +      config DEBUG_MSM_UART2
 +              bool "Kernel low-level debugging messages via MSM UART2"
 +              depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
                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.
 +                their output to the second serial port on MSM devices.
  
 -                The uncompressor code port configuration is now handled
 -                by CONFIG_S3C_LOWLEVEL_UART_PORT.
 +      config DEBUG_MSM_UART3
 +              bool "Kernel low-level debugging messages via MSM UART3"
 +              depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
 +              help
 +                Say Y here if you want the debug print routines to direct
 +                their output to the third serial port on MSM devices.
  
 -      config DEBUG_S3C_UART2
 -              depends on PLAT_SAMSUNG
 -              bool "Use S3C UART 2 for low-level debug"
 +      config DEBUG_MSM8660_UART
 +              bool "Kernel low-level debugging messages via MSM 8660 UART"
 +              depends on ARCH_MSM8X60
 +              select MSM_HAS_DEBUG_UART_HS
                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.
 +                their output to the serial port on MSM 8660 devices.
  
 -                The uncompressor code port configuration is now handled
 -                by CONFIG_S3C_LOWLEVEL_UART_PORT.
 +      config DEBUG_MSM8960_UART
 +              bool "Kernel low-level debugging messages via MSM 8960 UART"
 +              depends on ARCH_MSM8960
 +              select MSM_HAS_DEBUG_UART_HS
 +              help
 +                Say Y here if you want the debug print routines to direct
 +                their output to the serial port on MSM 8960 devices.
  
        config DEBUG_REALVIEW_STD_PORT
                bool "RealView Default UART"