Merge branch 'imx/fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes

* 'imx/fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM i.MX imx21ads: Fix overlapping static i/o mappings
  ARM i.MX27 Visstrim M10: fix gpio handling.
  ARM: imx: only call l2x0_init if it's available
  ARM: imx: only specify i2c device type once
  ARM: mx31_3ds: Fix build due to missing IMX_HAVE_PLATFORM_IMX_SSI

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

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

diff --cc arch/arm/mach-imx/mach-cpuimx51sd.c
index ac50f1671e381447d7fda9335d32cac33432b7ca,89eb93cec6013d56c4cf87205f724e2305b23bd1..1e09de50cbcdc9292ad762d6228c7663fbfcc4a2
--- 1/arch/arm/mach-imx/mach-cpuimx51sd.c
--- 2/arch/arm/mach-imx/mach-cpuimx51sd.c
+++ b/arch/arm/mach-imx/mach-cpuimx51sd.c
@@@ -142,8 -124,8 +142,7 @@@ static struct i2c_board_info eukrea_cpu
                I2C_BOARD_INFO("pcf8563", 0x51),
        }, {
                I2C_BOARD_INFO("tsc2007", 0x49),
-               .type           = "tsc2007",
                .platform_data  = &tsc2007_info,
 -              .irq            = IMX_GPIO_TO_IRQ(TSC2007_IRQGPIO),
        },
  };
  

diff --cc arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index dff82eb57cd9f8957d1db67689ae5d58d7a4884c,2c6a783d4c04a96f4039c4e0c51c9d6ebbfd81ea..f76edb96a48a671322f7a6c30935cfa524477463
--- 1/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
--- 2/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
@@@ -128,25 -121,26 +130,43 @@@ static const int visstrim_m10_pins[] __
        PB19_PF_CSI_D7,
        PB20_PF_CSI_VSYNC,
        PB21_PF_CSI_HSYNC,
 +      /* mother board version */
 +      MOTHERBOARD_BIT2 | GPIO_GPIO | GPIO_IN | GPIO_PUEN,
 +      MOTHERBOARD_BIT1 | GPIO_GPIO | GPIO_IN | GPIO_PUEN,
 +      MOTHERBOARD_BIT0 | GPIO_GPIO | GPIO_IN | GPIO_PUEN,
 +      /* expansion board version */
 +      EXPBOARD_BIT2 | GPIO_GPIO | GPIO_IN | GPIO_PUEN,
 +      EXPBOARD_BIT1 | GPIO_GPIO | GPIO_IN | GPIO_PUEN,
 +      EXPBOARD_BIT0 | GPIO_GPIO | GPIO_IN | GPIO_PUEN,
 +};
 +
 +static struct gpio visstrim_m10_version_gpios[] = {
 +      { EXPBOARD_BIT0, GPIOF_IN, "exp-version-0" },
 +      { EXPBOARD_BIT1, GPIOF_IN, "exp-version-1" },
 +      { EXPBOARD_BIT2, GPIOF_IN, "exp-version-2" },
 +      { MOTHERBOARD_BIT0, GPIOF_IN, "mother-version-0" },
 +      { MOTHERBOARD_BIT1, GPIOF_IN, "mother-version-1" },
 +      { MOTHERBOARD_BIT2, GPIOF_IN, "mother-version-2" },
  };
  
+ static const struct gpio visstrim_m10_gpios[] __initconst = {
+       {
+               .gpio = TVP5150_RSTN,
+               .flags = GPIOF_DIR_OUT | GPIOF_INIT_HIGH,
+               .label = "tvp5150_rstn",
+       },
+       {
+               .gpio = TVP5150_PWDN,
+               .flags = GPIOF_DIR_OUT | GPIOF_INIT_LOW,
+               .label = "tvp5150_pwdn",
+       },
+       {
+               .gpio = OTG_PHY_CS_GPIO,
+               .flags = GPIOF_DIR_OUT | GPIOF_INIT_LOW,
+               .label = "usbotg_cs",
+       },
+ };
+ 
  /* Camera */
  static int visstrim_camera_power(struct device *dev, int on)
  {

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

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