diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2013-05-05 18:58:13 +0200 |
|---|---|---|
| committer | Paul Kocialkowski <contact@paulk.fr> | 2013-05-05 18:58:13 +0200 |
| commit | b7e6d3ba0a71caa4581db68e1a8475e3239d7abc (patch) | |
| tree | 2c91439eac874cdf74bfdc21e971da1adc106ea8 | |
| parent | 737e645e2a4e063be4b70e51bb19fad30a7c497e (diff) | |
| download | kernel_goldelico_gta04-b7e6d3ba0a71caa4581db68e1a8475e3239d7abc.zip kernel_goldelico_gta04-b7e6d3ba0a71caa4581db68e1a8475e3239d7abc.tar.gz kernel_goldelico_gta04-b7e6d3ba0a71caa4581db68e1a8475e3239d7abc.tar.bz2 | |
gta04 audio: fix build and add to defconfig
| -rw-r--r-- | arch/arm/configs/gta04_defconfig | 5 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3gta04.c | 16 | ||||
| -rw-r--r-- | sound/soc/omap/gta04-audio.c | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/arch/arm/configs/gta04_defconfig b/arch/arm/configs/gta04_defconfig index d49a662..563c76a 100644 --- a/arch/arm/configs/gta04_defconfig +++ b/arch/arm/configs/gta04_defconfig @@ -2046,8 +2046,13 @@ CONFIG_SND_USB=y # CONFIG_SND_USB_CAIAQ is not set # CONFIG_SND_USB_6FIRE is not set CONFIG_SND_SOC=y +CONFIG_SND_SOC_TWL4030=y +CONFIG_SND_SOC_GTM601=y +CONFIG_SND_SOC_SI47XX=y +CONFIG_SND_SOC_W2CBW003=y # CONFIG_SND_SOC_CACHE_LZO is not set CONFIG_SND_OMAP_SOC=y +CONFIG_SND_OMAP_SOC_GTA04=y CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set # CONFIG_SOUND_PRIME is not set diff --git a/arch/arm/mach-omap2/board-omap3gta04.c b/arch/arm/mach-omap2/board-omap3gta04.c index 07ba2df..e73143e 100644 --- a/arch/arm/mach-omap2/board-omap3gta04.c +++ b/arch/arm/mach-omap2/board-omap3gta04.c @@ -652,18 +652,19 @@ static struct twl4030_usb_data gta04_usb_data = { .usb_mode = T2_USB_MODE_ULPI, }; -static struct twl4030_codec_data omap3_codec; #ifdef GTA04_MISSING static struct twl4030_vibra_data gta04_vibra_data = { .coexist = 0, }; +#endif + +static struct twl4030_codec_audio_data gta04_audio_data; -static struct twl4030_audio_data omap3_audio_pdata = { +static struct twl4030_codec_data gta04_codec_data = { .audio_mclk = 26000000, - .codec = &omap3_codec, - .vibra = >a04_vibra_data, + .audio = >a04_audio_data, }; -#endif + static struct twl4030_madc_platform_data gta04_madc_data = { .irq_line = 1, }; @@ -812,9 +813,7 @@ static struct twl4030_platform_data gta04_twldata = { .madc = >a04_madc_data, .power = >a04_power_scripts, /* empty but if not present, pm_power_off is not initialized */ .usb = >a04_usb_data, -#ifdef GTA04_MISSING - .audio = &omap3_audio_pdata, -#endif + .codec = >a04_codec_data, .clock = >a04_clock, .vaux1 = >a04_vaux1, @@ -864,7 +863,6 @@ static struct platform_device gta04_w2cbw003_codec_audio_device = { #ifdef CONFIG_TOUCHSCREEN_TSC2007 static int tsc2007_get_pendown_state(void) { - printk(KERN_ERR "tsc2007 get pendown state\n"); return gpio_get_value(GTA04_TSC2007_GPIO) ? 0 : 1; } diff --git a/sound/soc/omap/gta04-audio.c b/sound/soc/omap/gta04-audio.c index 67867f0..b6c5c6f 100644 --- a/sound/soc/omap/gta04-audio.c +++ b/sound/soc/omap/gta04-audio.c @@ -188,8 +188,6 @@ static struct snd_soc_dai_link omap3gta04_dai = { .platform_name = "omap-pcm-audio", .codec_dai_name = "twl4030-hifi", .codec_name = "twl4030-codec", - .dai_fmt = (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | - SND_SOC_DAIFMT_CBM_CFM), .ops = &omap3gta04_ops, .init = &omap3gta04_init }; |