diff options
| author | Simon Wilson <simonwilson@google.com> | 2011-04-18 09:25:12 -0700 |
|---|---|---|
| committer | Simon Wilson <simonwilson@google.com> | 2011-04-18 16:19:26 -0700 |
| commit | e50401b23222f9cf512afb80f8da30983d35011a (patch) | |
| tree | 7c6cca6aae3572bb8584d01b34c976626256285b | |
| parent | c64e9bd9d22cd57a04ac05ff6998993ddd889f21 (diff) | |
| download | experimental-sandbox/simonwilson/audio/android-omap-2.6.39.tar.gz | |
hacks to add sound supportsandbox/simonwilson/audio/android-omap-2.6.39
| -rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 12 | ||||
| -rw-r--r-- | arch/arm/plat-omap/devices.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/mcbsp.c | 2 | ||||
| -rw-r--r-- | sound/soc/Makefile | 2 | ||||
| -rw-r--r-- | sound/soc/omap/sdp4430.c | 9 |
5 files changed, 22 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 51154f65f0a..20c98bac0ab 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -395,6 +395,15 @@ static struct regulator_init_data omap4_panda_clk32kg = { }, }; +static struct twl4030_codec_audio_data twl6040_audio; + +static struct twl4030_codec_data twl6040_codec = { + .audio_mclk = 38400000, + .audio = &twl6040_audio, + .audpwron_gpio = 127, + //.naudint_irq = OMAP44XX_IRQ_SYS_2N, +}; + static struct twl4030_platform_data omap4_panda_twldata = { .irq_base = TWL6030_IRQ_BASE, .irq_end = TWL6030_IRQ_END, @@ -410,6 +419,9 @@ static struct twl4030_platform_data omap4_panda_twldata = { .vaux3 = &omap4_panda_vaux3, .clk32kg = &omap4_panda_clk32kg, .usb = &omap4_usbphy_data, + + /* children */ + .codec = &twl6040_codec, }; static struct i2c_board_info __initdata omap4_panda_i2c_boardinfo[] = { diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 7d9f815cede..646fd578b4f 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -93,7 +93,7 @@ static struct resource mcpdm_resources[] = { }; static struct platform_device omap_mcpdm_device = { - .name = "omap-mcpdm", + .name = "omap-mcpdm-dai", .id = -1, .num_resources = ARRAY_SIZE(mcpdm_resources), .resource = mcpdm_resources, diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index d598d9fd65a..1eb6f78f6a9 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c @@ -845,7 +845,7 @@ int omap_mcbsp_request(unsigned int id) goto err_clk_disable; } - if (mcbsp->rx_irq) { + if (mcbsp->rx_irq > 0) { init_completion(&mcbsp->rx_irq_completion); err = request_irq(mcbsp->rx_irq, omap_mcbsp_rx_irq_handler, diff --git a/sound/soc/Makefile b/sound/soc/Makefile index 0af701644ad..e3c343aa41b 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -1,3 +1,5 @@ +ccflags-$(CONFIG_SND_SOC) := -DDEBUG + snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o soc-dsp.o obj-$(CONFIG_SND_SOC) += snd-soc-core.o diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c index bde192e8363..c0944300119 100644 --- a/sound/soc/omap/sdp4430.c +++ b/sound/soc/omap/sdp4430.c @@ -521,7 +521,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { /* * Frontend DAIs - i.e. userspace visible interfaces (ALSA PCMs) */ - +#if 0 { .name = "SDP4430 Media", .stream_name = "Multimedia", @@ -602,6 +602,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { .dynamic = 1, /* BE is dynamic */ .dsp_link = &fe_lp_media, }, +#endif #ifdef CONFIG_SND_OMAP_SOC_HDMI { .name = "hdmi", @@ -644,6 +645,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { .ops = &sdp4430_mcpdm_ops, }, +#if 0 { .name = "Legacy DMIC", .stream_name = "DMIC Capture", @@ -658,12 +660,12 @@ static struct snd_soc_dai_link sdp4430_dai[] = { .ops = &sdp4430_dmic_ops, }, - +#endif /* * Backend DAIs - i.e. dynamically matched interfaces, invisible to userspace. * Matched to above interfaces at runtime, based upon use case. */ - +#if 0 { .name = OMAP_ABE_BE_PDM_DL1, .stream_name = "HS Playback", @@ -832,6 +834,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { .be_hw_params_fixup = dmic_be_hw_params_fixup, .be_id = OMAP_ABE_DAI_DMIC2, }, +#endif }; /* Audio machine driver */ |