Merge remote-tracking branch 'grant/gpio/next-mx' into for-next

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

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

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

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

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

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

diff --cc arch/arm/mach-mx5/board-mx51_3ds.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/board-mx53_evk.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx53_loco.c
index e5e8c85ff4eb866ef3d7369ca32231d7291cfc29,359c3e248addc02c03d67ca52cff699439c3a010..57576f709f2031f28891bce4f81a44150a30016a
--- 1/arch/arm/mach-mx5/board-mx53_loco.c
--- 2/arch/arm/mach-mx5/board-mx53_loco.c
+++ b/arch/arm/mach-mx5/board-mx53_loco.c
@@@ -226,21 -225,10 +226,23 @@@ static const struct imxi2c_platform_dat
        .bitrate = 100000,
  };
  
 +static const struct gpio_led mx53loco_leds[] __initconst = {
 +      {
 +              .name                   = "green",
 +              .default_trigger        = "heartbeat",
 +              .gpio                   = LOCO_LED,
 +      },
 +};
 +
 +static const struct gpio_led_platform_data mx53loco_leds_data __initconst = {
 +      .leds           = mx53loco_leds,
 +      .num_leds       = ARRAY_SIZE(mx53loco_leds),
 +};
 +
  static void __init mx53_loco_board_init(void)
  {
+       imx53_soc_init();
+ 
        mxc_iomux_v3_setup_multiple_pads(mx53_loco_pads,
                                        ARRAY_SIZE(mx53_loco_pads));
        imx53_add_imx_uart(0, NULL);

diff --cc arch/arm/mach-mxs/mach-mx28evk.c
Simple merge