summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-igep0020.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-02-09 16:55:44 -0800
committerOlof Johansson <olof@lixom.net>2013-02-09 16:55:44 -0800
commit78d9b8055b9aaf53ced11fc15728df31610a21e9 (patch)
treed427fb08840a10c6c4fcf38d77d2e2a46e5192fd /arch/arm/mach-omap2/board-igep0020.c
parent61cfd8736040dd2d620278fb11c6c4acfeb041c9 (diff)
parent6689c87555839d90f2a0b76d1f982713487a11d2 (diff)
Merge tag 'omap-for-v3.9/twl-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
From Tony Lidgren: OMAP TWL updates from Peter Ujfalusi <peter.ujfalusi@ti.com>: Update for audio support via omap-twl4030 and pwm updates in board level, and zoom-peripherals update to not request the TWL GPIO7. * tag 'omap-for-v3.9/twl-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Fix twl section warnings related to omap_twl4030_audio_init ARM: board-zoom: Do not request LCD panel enable GPIO from twl4030 ARM: OMAP: omap3beagle: Use the pwm_leds driver to control the PMU_STAT led ARM: OMAP: board-4430sdp: Proper support for TWL6030 PWM LED/Backlight ARM: OMAP: sdp3430: Audio support via the common omap-twl4030 machine driver ARM: OMAP: zoom: Audio support via the common omap-twl4030 machine driver ARM: OMAP2+: twl-common: Allow boards to customize the twl4030 audio setup ARM: OMAP2+: twl-common: Add default twl4030 audio configuration ARM: OMAP: zoom: Zoom2 does not have extmute functionality ARM: OMAP: 3430sdp: Enable extmute functionality for audio
Diffstat (limited to 'arch/arm/mach-omap2/board-igep0020.c')
-rw-r--r--arch/arm/mach-omap2/board-igep0020.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 1921541a727..2939c3d6549 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -629,7 +629,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