Merge commit 'v3.1-rc1' into imx-fixes

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

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

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

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

diff --cc arch/arm/mach-mx5/board-mx51_babbage.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_efikamx.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_efikasb.c
Simple merge

diff --cc arch/arm/mach-mx5/clock-mx51-mx53.c
Simple merge

diff --cc arch/arm/mach-mx5/mx51_efika.c
Simple merge

diff --cc arch/arm/plat-mxc/include/mach/iomux-mx53.h
index 468674f4e1ba588c9f8ddeefbc6f673748088423,9440b9e00e89c1536ce3d2e8d7ecbb55a5bbfd99..5408fd1fc7368b094612c7701ac55a02ab097232
--- 1/arch/arm/plat-mxc/include/mach/iomux-mx53.h
--- 2/arch/arm/plat-mxc/include/mach/iomux-mx53.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mx53.h
@@@ -1732,10 -1729,10 +1732,10 @@@
  #define MX53_PAD_EIM_D27__IPU_DISP1_DAT_23            (_MX53_PAD_EIM_D27__IPU_DISP1_DAT_23 | MUX_PAD_CTRL(NO_PAD_CTRL))
  #define MX53_PAD_EIM_D28__EMI_WEIM_D_28               (_MX53_PAD_EIM_D28__EMI_WEIM_D_28 | MUX_PAD_CTRL(NO_PAD_CTRL))
  #define MX53_PAD_EIM_D28__GPIO3_28            (_MX53_PAD_EIM_D28__GPIO3_28 | MUX_PAD_CTRL(NO_PAD_CTRL))
- #define MX53_PAD_EIM_D28__UART2_CTS           (_MX53_PAD_EIM_D28__UART2_CTS | MUX_PAD_CTRL(NO_PAD_CTRL))
+ #define MX53_PAD_EIM_D28__UART2_CTS           (_MX53_PAD_EIM_D28__UART2_CTS | MUX_PAD_CTRL(MX53_UART_PAD_CTRL))
  #define MX53_PAD_EIM_D28__IPU_DISPB0_SER_DIO          (_MX53_PAD_EIM_D28__IPU_DISPB0_SER_DIO | MUX_PAD_CTRL(NO_PAD_CTRL))
  #define MX53_PAD_EIM_D28__CSPI_MOSI           (_MX53_PAD_EIM_D28__CSPI_MOSI | MUX_PAD_CTRL(NO_PAD_CTRL))
 -#define MX53_PAD_EIM_D28__I2C1_SDA            (_MX53_PAD_EIM_D28__I2C1_SDA | MUX_PAD_CTRL(NO_PAD_CTRL))
 +#define MX53_PAD_EIM_D28__I2C1_SDA            (_MX53_PAD_EIM_D28__I2C1_SDA | MUX_PAD_CTRL(PAD_CTRL_I2C))
  #define MX53_PAD_EIM_D28__IPU_EXT_TRIG                (_MX53_PAD_EIM_D28__IPU_EXT_TRIG | MUX_PAD_CTRL(NO_PAD_CTRL))
  #define MX53_PAD_EIM_D28__IPU_DI0_PIN13               (_MX53_PAD_EIM_D28__IPU_DI0_PIN13 | MUX_PAD_CTRL(NO_PAD_CTRL))
  #define MX53_PAD_EIM_D29__EMI_WEIM_D_29               (_MX53_PAD_EIM_D29__EMI_WEIM_D_29 | MUX_PAD_CTRL(NO_PAD_CTRL))