Merge branch 'imx/imx6q' into next/soc

Conflicts:
	arch/arm/Kconfig
	arch/arm/Kconfig.debug
	arch/arm/mach-mxs/include/mach/gpio.h
	arch/arm/plat-mxc/include/mach/gpio.h

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
index 65a49bfdf7ef627315b644129eefa9077680eb15,2564a9bc10cc06475c7287584d8f81b96829abce..29d82373229bb6e35bd06c215c79822ad42b5214
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1408,7 -1376,7 +1409,7 @@@ config SM
        depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \
                 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
                 ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
-                ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK
 -               ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || SOC_IMX6Q
++               ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK || SOC_IMX6Q
        select USE_GENERIC_SMP_HELPERS
        select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
        help

diff --cc arch/arm/Kconfig.debug
index 4bb7eb90f0706797f84b47dd442ebedf4295887e,a1cb48497312393b7c1156b7390f4cc0eaa16b95..c865b927136464568904dee22f05ca586e11dced
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -128,13 -128,118 +128,125 @@@ choic
                  Say Y here if you want the debug print routines to direct
                  their output to the second serial port on these devices.
  
 +      config DEBUG_HIGHBANK_UART
 +              bool "Kernel low-level debugging messages via Highbank UART"
 +              depends on ARCH_HIGHBANK
 +              help
 +                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

diff --cc arch/arm/Makefile
Simple merge

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

diff --cc arch/arm/mach-mxs/include/mach/gpio.h
index bb11e63261e491fb36c750787487c23bce2dc313,56025aa0a639ea68d7b523c147004215dc0010cf..01ee648b1c7e1e17aa34ba96bc86ae4eba67bba4
--- 1/arch/arm/mach-mxs/include/mach/gpio.h
--- 2/arch/arm/mach-mxs/include/mach/gpio.h
+++ b/arch/arm/mach-mxs/include/mach/gpio.h
@@@ -20,8 -20,12 +20,4 @@@
  #ifndef __MACH_MXS_GPIO_H__
  #define __MACH_MXS_GPIO_H__
  
- #define MXS_GPIO_NR(bank, nr) ((bank) * 32 + (nr))
 -#include <asm-generic/gpio.h>
--
- #define irq_to_gpio(irq)      ((irq) - MXS_GPIO_IRQ_START)
 -/* use gpiolib dispatchers */
 -#define gpio_get_value                __gpio_get_value
 -#define gpio_set_value                __gpio_set_value
 -#define gpio_cansleep         __gpio_cansleep
 -#define gpio_to_irq           __gpio_to_irq
--
  #endif /* __MACH_MXS_GPIO_H__ */

diff --cc arch/arm/mm/Kconfig
index 7d5fff7b36322ef5b8b1ff49a62737c27ec6835b,9ab5be07061a21dd6f67d7f476c3cec2c314774a..67f75a0b66d640c4ffdd44b74fc2ac37e8b0063d
--- 1/arch/arm/mm/Kconfig
--- 2/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@ -819,10 -819,10 +819,10 @@@ config CACHE_FEROCEON_L2_WRITETHROUG
  config CACHE_L2X0
        bool "Enable the L2x0 outer cache controller"
        depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \
-                  REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \
+                  REALVIEW_EB_A9MP || ARCH_IMX_V6_V7 || MACH_REALVIEW_PBX || \
                   ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \
                   ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \
 -                 ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX
 +                 ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX || ARCH_HIGHBANK
        default y
        select OUTER_CACHE
        select OUTER_CACHE_SYNC

diff --cc arch/arm/plat-mxc/include/mach/gpio.h
index 3e1ffc8b8f0c2d56283bdbc92b476bb07f86196d,44af0064ba1a96485d30bece8ee4d3a3183e0369..54fe5cb83dea29234f6eb5e54e75f3f4f849a260
--- 1/arch/arm/plat-mxc/include/mach/gpio.h
--- 2/arch/arm/plat-mxc/include/mach/gpio.h
+++ b/arch/arm/plat-mxc/include/mach/gpio.h
@@@ -19,15 -19,14 +19,4 @@@
  #ifndef __ASM_ARCH_MXC_GPIO_H__
  #define __ASM_ARCH_MXC_GPIO_H__
  
--#include <linux/spinlock.h>
--#include <mach/hardware.h>
- 
- 
- /* There's a off-by-one betweem the gpio bank number and the gpiochip */
- /* range e.g. GPIO_1_5 is gpio 5 under linux */
- #define IMX_GPIO_NR(bank, nr)         (((bank) - 1) * 32 + (nr))
 -#include <asm-generic/gpio.h>
--
- #define gpio_to_irq(gpio)     (MXC_GPIO_IRQ_START + (gpio))
- #define irq_to_gpio(irq)      ((irq) - MXC_GPIO_IRQ_START)
 -/* use gpiolib dispatchers */
 -#define gpio_get_value                __gpio_get_value
 -#define gpio_set_value                __gpio_set_value
 -#define gpio_cansleep         __gpio_cansleep
 -#define gpio_to_irq           __gpio_to_irq
--
  #endif