summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-12-05 17:40:30 +0400
committerPeter Ujfalusi <peter.ujfalusi@ti.com>2013-01-22 13:34:47 +0400
commit02553f5ac2b3e7d0405e5a51d87ef0727ad6fb2f (patch)
treeda62dada8b11eac96eb60e7b320e9fe29569a15c /arch/arm/mach-omap2
parent98b0606e9a31397f534eb8bce697618d84a2165d (diff)
downloadlinux-02553f5ac2b3e7d0405e5a51d87ef0727ad6fb2f.tar.xz
ARM: OMAP2+: twl-common: Add default twl4030 audio configuration
Select the most commonly used audio configuration on boards with twl4030 audio: Headset, Handsfree output and Line in input Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/twl-common.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
index e49b40b4c90a..cd1cba84bcd9 100644
--- a/arch/arm/mach-omap2/twl-common.c
+++ b/arch/arm/mach-omap2/twl-common.c
@@ -528,7 +528,12 @@ void __init omap4_pmic_get_config(struct twl4030_platform_data *pmic_data,
defined(CONFIG_SND_OMAP_SOC_OMAP_TWL4030_MODULE)
#include <linux/platform_data/omap-twl4030.h>
-static struct omap_tw4030_pdata omap_twl4030_audio_data;
+/* Commonly used configuration */
+static struct omap_tw4030_pdata omap_twl4030_audio_data = {
+ .has_hs = OMAP_TWL4030_LEFT | OMAP_TWL4030_RIGHT,
+ .has_hf = OMAP_TWL4030_LEFT | OMAP_TWL4030_RIGHT,
+ .has_linein = OMAP_TWL4030_LEFT | OMAP_TWL4030_RIGHT,
+};
static struct platform_device audio_device = {
.name = "omap-twl4030",