diff options
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3gta04.c | 26 | ||||
| -rw-r--r-- | sound/soc/omap/Makefile | 4 |
2 files changed, 28 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-omap3gta04.c b/arch/arm/mach-omap2/board-omap3gta04.c index c8b14af..bde372e 100644 --- a/arch/arm/mach-omap2/board-omap3gta04.c +++ b/arch/arm/mach-omap2/board-omap3gta04.c @@ -69,6 +69,7 @@ #include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/omap-pwm.h> +#include <linux/platform_data/omap-twl4030.h> #include <linux/platform_data/serial-omap.h> #include "omap_device.h" @@ -261,6 +262,30 @@ static struct platform_device backlight_device = { .id = -1, }; +static struct omap_tw4030_pdata audio_pdata = { +// .voice_connected = true, + .custom_routing = true, + + .has_hs = OMAP_TWL4030_LEFT | OMAP_TWL4030_RIGHT, + .has_hf = OMAP_TWL4030_LEFT | OMAP_TWL4030_RIGHT, + .has_ear = true, + + .has_mainmic = true, + .has_submic = false, + .has_hsmic = true, + .has_linein = OMAP_TWL4030_LEFT | OMAP_TWL4030_RIGHT, + + .card_name = "gta04", +}; +static struct platform_device twl4030_audio_device = { + .name = "omap-twl4030", + .dev = { + .platform_data = &audio_pdata, + }, + .id = -1, +}; + + static int gta04_enable_lcd(struct omap_dss_device *dssdev) { static int did_reg = 0; @@ -1171,6 +1196,7 @@ static struct platform_device madc_hwmon = { static struct platform_device *gta04_devices[] __initdata = { &pwm_device, + &twl4030_audio_device, // &leds_gpio, &keys_gpio, &keys_3G_gpio, diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index e3f3885..128b509 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -20,8 +20,8 @@ snd-soc-am3517evm-objs := am3517evm.o snd-soc-omap-abe-twl6040-objs := omap-abe-twl6040.o snd-soc-omap-twl4030-objs := omap-twl4030.o snd-soc-omap3pandora-objs := omap3pandora.o -snd-soc-gta04-objs := gta04-audio.o gta04-voice.o gta04-headset.o -# gta04-fm.o +snd-soc-gta04-objs := gta04-voice.o gta04-headset.o +# gta04-fm.o gta04-audio.o snd-soc-omap-hdmi-card-objs := omap-hdmi-card.o obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o |