Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC board specific changes from Arnd Bergmann:
 "These updates are all for board specific code, including

   - defconfig updates for shmobile, davinci, bcm2835, imx, omap and
     tegra

   - SD/MMC and I2C support on bcm2835 (Raspberry PI)

   - minor updates for PXA

   - shmobile updates to GPIO usage in board files

   - More things in OMAP board files are moved over to device tree
     probing

   - Better support for audio devices on some OMAP platforms"

* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (55 commits)
  ARM: imx_v4_v5_defconfig: Add VPU support
  ARM: imx: configs: enable netfilter support
  ARM: OMAP2+: Fix twl section warnings related to omap_twl4030_audio_init
  ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc
  RX-51: Register twl4030-madc device
  RX-51: Add leds lp5523 names from Maemo 5 2.6.28 kernel
  ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers
  ARM: OMAP1: nokia770: enable CBUS/Retu
  ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator
  ARM: OMAP2+: omap2plus_defconfig: enable TFP410 chip support
  ARM: OMAP3: igep0020: simplify GPIO LEDs dependencies
  ARM: OMAP2+: craneboard: support the TPS65910 PMU
  ARM: OMAP2+: craneboard: support NAND device
  ARM: OMAP3: cm-t3517: add MMC support
  ARM: OMAP2+: Remove apollon board support
  ARM: shmobile: armadillo800eva: set clock rates before timer init
  ARM: tegra: defconfig updates
  ARM: shmobile: mackerel: Use gpio_request_one()
  ARM: shmobile: kzm9g: Use gpio_request_one()
  ARM: shmobile: bonito: Use gpio_request_one()
  ...

1 files changed, 9 insertions, 9 deletions

diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index c10738a067cd..bf92678a01d0 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -301,20 +301,20 @@ static struct omap2_hsmmc_info mmc[] = {
 
 static struct gpio_led igep_gpio_leds[] = {
         [0] = {
-                .name                   = "gpio-led:red:d0",
-                .default_trigger        = "default-off"
+                .name                   = "omap3:red:user0",
+                .default_state          = 0,
         },
         [1] = {
-                .name                   = "gpio-led:green:d0",
-                .default_trigger        = "default-off",
+                .name                   = "omap3:green:boot",
+                .default_state          = 1,
         },
         [2] = {
-                .name                   = "gpio-led:red:d1",
-                .default_trigger        = "default-off",
+                .name                   = "omap3:red:user1",
+                .default_state          = 0,
         },
         [3] = {
-                .name                   = "gpio-led:green:d1",
-                .default_trigger        = "heartbeat",
+                .name                   = "omap3:green:user1",
+                .default_state          = 0,
                 .gpio                   = -EINVAL, /* gets replaced */
                 .active_low             = 1,
         },
@@ -631,7 +631,7 @@ static void __init igep_init(void)
 
         igep_flash_init();
         igep_leds_init();
-        omap_twl4030_audio_init("igep2");
+        omap_twl4030_audio_init("igep2", NULL);
 
         /*
          * WLAN-BT combo module from MuRata which has a Marvell WLAN