October 2010 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: omap: Remove needless prints from machine drivers
by Jarkko Nikula 10 Oct '10

10 Oct '10

It is currently completely normal to execute these machine drivers code on different boards if the kernel includes support for multiple boards so no error message should be printed if the machine_is_xxx does not match with the machine driver. Therefore remove these pr_err and pr_debug prints in those cases. Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> --- sound/soc/omap/am3517evm.c | 4 +--- sound/soc/omap/igep0020.c | 4 +--- sound/soc/omap/omap2evm.c | 4 +--- sound/soc/omap/omap3beagle.c | 4 +--- sound/soc/omap/omap3evm.c | 4 +--- sound/soc/omap/sdp3430.c | 4 +--- sound/soc/omap/sdp4430.c | 4 +--- sound/soc/omap/zoom2.c | 4 +--- 8 files changed, 8 insertions(+), 24 deletions(-) diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c index 68bd902..979dd50 100644 --- a/sound/soc/omap/am3517evm.c +++ b/sound/soc/omap/am3517evm.c @@ -157,10 +157,8 @@ static int __init am3517evm_soc_init(void) { int ret; - if (!machine_is_omap3517evm()) { - pr_err("Not OMAP3517 / AM3517 EVM!\n"); + if (!machine_is_omap3517evm()) return -ENODEV; - } pr_info("OMAP3517 / AM3517 EVM SoC init\n"); am3517evm_snd_device = platform_device_alloc("soc-audio", -1); diff --git a/sound/soc/omap/igep0020.c b/sound/soc/omap/igep0020.c index d296cfc..fd3a40f 100644 --- a/sound/soc/omap/igep0020.c +++ b/sound/soc/omap/igep0020.c @@ -101,10 +101,8 @@ static int __init igep2_soc_init(void) { int ret; - if (!machine_is_igep0020()) { - pr_debug("Not IGEP v2!\n"); + if (!machine_is_igep0020()) return -ENODEV; - } printk(KERN_INFO "IGEP v2 SoC init\n"); igep2_snd_device = platform_device_alloc("soc-audio", -1); diff --git a/sound/soc/omap/omap2evm.c b/sound/soc/omap/omap2evm.c index 38cd189..cf3fc8a 100644 --- a/sound/soc/omap/omap2evm.c +++ b/sound/soc/omap/omap2evm.c @@ -103,10 +103,8 @@ static int __init omap2evm_soc_init(void) { int ret; - if (!machine_is_omap2evm()) { - pr_debug("Not omap2evm!\n"); + if (!machine_is_omap2evm()) return -ENODEV; - } printk(KERN_INFO "omap2evm SoC init\n"); omap2evm_snd_device = platform_device_alloc("soc-audio", -1); diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c index 7c11e1a..e56832b 100644 --- a/sound/soc/omap/omap3beagle.c +++ b/sound/soc/omap/omap3beagle.c @@ -112,10 +112,8 @@ static int __init omap3beagle_soc_init(void) { int ret; - if (!(machine_is_omap3_beagle() || machine_is_devkit8000())) { - pr_debug("Not OMAP3 Beagle or Devkit8000!\n"); + if (!(machine_is_omap3_beagle() || machine_is_devkit8000())) return -ENODEV; - } pr_info("OMAP3 Beagle/Devkit8000 SoC init\n"); omap3beagle_snd_device = platform_device_alloc("soc-audio", -1); diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c index 1ac5bab..810f1e3 100644 --- a/sound/soc/omap/omap3evm.c +++ b/sound/soc/omap/omap3evm.c @@ -99,10 +99,8 @@ static int __init omap3evm_soc_init(void) { int ret; - if (!machine_is_omap3evm()) { - pr_err("Not OMAP3 EVM!\n"); + if (!machine_is_omap3evm()) return -ENODEV; - } pr_info("OMAP3 EVM SoC init\n"); omap3evm_snd_device = platform_device_alloc("soc-audio", -1); diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c index 76ce77b..07fbcf7 100644 --- a/sound/soc/omap/sdp3430.c +++ b/sound/soc/omap/sdp3430.c @@ -296,10 +296,8 @@ static int __init sdp3430_soc_init(void) int ret; u8 pin_mux; - if (!machine_is_omap_3430sdp()) { - pr_debug("Not SDP3430!\n"); + if (!machine_is_omap_3430sdp()) return -ENODEV; - } printk(KERN_INFO "SDP3430 SoC init\n"); sdp3430_snd_device = platform_device_alloc("soc-audio", -1); diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c index 62f6a62..4b4463d 100644 --- a/sound/soc/omap/sdp4430.c +++ b/sound/soc/omap/sdp4430.c @@ -186,10 +186,8 @@ static int __init sdp4430_soc_init(void) { int ret; - if (!machine_is_omap_4430sdp()) { - pr_debug("Not SDP4430!\n"); + if (!machine_is_omap_4430sdp()) return -ENODEV; - } printk(KERN_INFO "SDP4430 SoC init\n"); sdp4430_snd_device = platform_device_alloc("soc-audio", -1); diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c index 338dc95..718031e 100644 --- a/sound/soc/omap/zoom2.c +++ b/sound/soc/omap/zoom2.c @@ -245,10 +245,8 @@ static int __init zoom2_soc_init(void) { int ret; - if (!machine_is_omap_zoom2()) { - pr_debug("Not Zoom2!\n"); + if (!machine_is_omap_zoom2()) return -ENODEV; - } printk(KERN_INFO "Zoom2 SoC init\n"); zoom2_snd_device = platform_device_alloc("soc-audio", -1); -- 1.7.1

3 2

[alsa-devel] [PATCH 1/2] ASoC: Staticise CS4270 DAI
by Mark Brown 10 Oct '10

10 Oct '10

It's not needed with multi-component. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/cs4270.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 5fd8e0d..6d4bdc6 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -518,7 +518,7 @@ static struct snd_soc_dai_ops cs4270_dai_ops = { .digital_mute = cs4270_dai_mute, }; -struct snd_soc_dai_driver cs4270_dai = { +static struct snd_soc_dai_driver cs4270_dai = { .name = "cs4270-hifi", .playback = { .stream_name = "Playback", -- 1.7.1

3 4

Re: [alsa-devel] [PATCH 1/2] ASoC: Shrink code size for WM8962 register defaults table
by Liam Girdwood 10 Oct '10

10 Oct '10

On Thu, 2010-10-07 at 20:50 -0700, Mark Brown wrote: > Dramatically reduce the code size for the WM8962 register defaults > table > by switching to explicitly initialise only defined registers, relying > on > static defaulting to zero for the overwelming bulk of the register > map. > > Similar treatement for the register access table will come later and > will > produce a similarly dramatic code size shrink. > > Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Both Acked-by: Liam Girdwood <lrg(a)slimlogic.co.uk> -- Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk

1 0

[alsa-devel] proposed change to amidi: allow data from stdin
by Al Steffens 10 Oct '10

10 Oct '10

ALSA Developers, Proposed change to amidi: allow data from stdin. A simple addition to amidi to allow midi commands from standard input would facilitate a MIDI-over-IP setup in which amidi and netcat together could send/receive raw MIDI over a network, or the internet. I'm thinking of something as simple as nc host port | amidi -p hw:1,0 to receive raw midi from someone on the internet and pipe the midi commands to one of my tone generators. This would further the effort to realize the "online jamming" idea with MIDI. Currently, amidi will read raw MIDI commands from a file using the "-s" flag. I have tried this with a named pipe, but amidi tries to get the file size causing an error. Perhaps fixing this would be one solution. Al Steffens apsteffe(a)netwood.net

1 0

[alsa-devel] bug report: aloop: potential signedness bug in loopback_prepare()
by Dan Carpenter 09 Oct '10

09 Oct '10

Hi Jaroslav, sound/drivers/aloop.c +287 loopback_prepare(10) warn: bogus compare against zero: 'bps' 282 unsigned int bps, salign; 283 284 salign = (snd_pcm_format_width(runtime->format) * 285 runtime->channels) / 8; 286 bps = salign * runtime->rate; 287 if (bps <= 0 || salign <= 0) ^^^^^^^^^^^^^^^^^^^^^^^ Both "bps" and "salign" are unsigned and are never less than zero. Should this just be checking for == 0? Or was the check supposed to catch integer overflows? 288 return -EINVAL; 289 regards, dan carpenter

2 2

[alsa-devel] [PATCH v1 4/6] davinci: SOUND support for Omapl138-Hawkboard
by vm.rod25＠gmail.com 09 Oct '10

09 Oct '10

From: Victor Rodriguez <victor.rodriguez(a)sasken.com> This patch adds sound support for the Hawkboard-L138 system It is under the machine name "omapl138_hawkboard". This system is based on the da850 davinci CPU architecture. Signed-off-by: Victor Rodriguez <victor.rodriguez(a)sasken.com> --- Notes: This patch works with da8xx_omapl_defconfig In order to test ALSA utils select in menuconfig like insmodule: Sound card support ---> Advanced Linux Sound Architecture ---> ALSA for SoC audio support ---> SoC Audio for the TI DAVINCI chip SoC Audio support for DA850/OMAP-L138 EVM/Hawkboard arch/arm/mach-davinci/board-omapl138-hawk.c | 46 +++++++++++++++++++++++++++ arch/arm/mach-davinci/da850.c | 2 +- 2 files changed, 47 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 01eef73..ba3718a 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/console.h> #include <linux/gpio.h> +#include <linux/i2c.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -116,6 +117,37 @@ static struct edma_rsv_info *da850_edma_rsv[2] = { &da850_edma_cc1_rsv, }; +static struct i2c_board_info __initdata omapl138_hawk_i2c_devices[] = { + { + I2C_BOARD_INFO("tlv320aic3x", 0x18), + }, +}; + +static struct davinci_i2c_platform_data omapl138_hawk_i2c_0_pdata = { + .bus_freq = 100, /* kHz */ + .bus_delay = 0, /* usec */ +}; + +/* davinci da850 evm audio machine driver */ +static u8 da850_iis_serializer_direction[] = { + INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, + INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, + INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, + INACTIVE_MODE, TX_MODE, RX_MODE, INACTIVE_MODE, +}; + +static struct snd_platform_data omapl138_hawk_snd_data = { + .tx_dma_offset = 0x2000, + .rx_dma_offset = 0x2000, + .op_mode = DAVINCI_MCASP_IIS_MODE, + .num_serializer = ARRAY_SIZE(da850_iis_serializer_direction), + .tdm_slots = 2, + .serial_dir = da850_iis_serializer_direction, + .asp_chan_q = EVENTQ_1, + .version = MCASP_VERSION_2, + .txnumevt = 1, + .rxnumevt = 1, +}; static struct davinci_uart_config omapl138_hawk_uart_config __initdata = { .enabled_uarts = 0x7, @@ -134,6 +166,20 @@ static __init void omapl138_hawk_init(void) ret = omapl138_hawk_config_emac(); + i2c_register_board_info(1, omapl138_hawk_i2c_devices, + ARRAY_SIZE(omapl138_hawk_i2c_devices)); + + ret = da8xx_register_i2c(0, &omapl138_hawk_i2c_0_pdata); + if (ret) + pr_warning("omapl138_hawk_init: " + "i2c0 registration failed: %d\n", ret); + + ret = davinci_cfg_reg_list(da850_mcasp_pins); + if (ret) + pr_warning("omapl138_hawk_init: " + "mcasp mux setup failed: %d\n", ret); + da8xx_register_mcasp(0, &omapl138_hawk_snd_data); + ret = da8xx_register_watchdog(); if (ret) pr_warning("omapl138_hawk_init: " diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 63916b9..f033a0a 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -591,7 +591,7 @@ const short da850_cpgmac_pins[] __initdata = { const short da850_mcasp_pins[] __initdata = { DA850_AHCLKX, DA850_ACLKX, DA850_AFSX, DA850_AHCLKR, DA850_ACLKR, DA850_AFSR, DA850_AMUTE, - DA850_AXR_11, DA850_AXR_12, + DA850_AXR_11, DA850_AXR_12, DA850_AXR_13, DA850_AXR_14, -1 }; -- 1.6.0.5

2 1

[alsa-devel] [PATCH v1 3/6] ASoC: davinci: ASoC support for Omapl138-Hawkboard
by vm.rod25＠gmail.com 09 Oct '10

09 Oct '10

From: Victor Rodriguez <victor.rodriguez(a)sasken.com> This patch adds ASoC support for the Hawkboard-L138 system It is under the machine name "omapl138_hawkboard". This system is based on the da850 davinci CPU architecture. Signed-off-by: Victor Rodriguez <victor.rodriguez(a)sasken.com> --- sound/soc/davinci/Kconfig | 5 +++-- sound/soc/davinci/davinci-evm.c | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig index 6bbf001..d6cb394 100644 --- a/sound/soc/davinci/Kconfig +++ b/sound/soc/davinci/Kconfig @@ -76,8 +76,9 @@ config SND_DA830_SOC_EVM DA830/OMAP-L137 EVM config SND_DA850_SOC_EVM - tristate "SoC Audio support for DA850/OMAP-L138 EVM" - depends on SND_DAVINCI_SOC && MACH_DAVINCI_DA850_EVM + tristate "SoC Audio support for DA850/OMAP-L138 EVM/Hawkboard" + depends on SND_DAVINCI_SOC&& (MACH_DAVINCI_DA850_EVM \ + || MACH_OMAPL138_HAWKBOARD) select SND_DAVINCI_SOC_MCASP select SND_SOC_TLV320AIC3X help diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 97f74d6..73093eb 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -59,7 +59,8 @@ static int evm_hw_params(struct snd_pcm_substream *substream, sysclk = 12288000; else if (machine_is_davinci_da830_evm() || - machine_is_davinci_da850_evm()) + machine_is_davinci_da850_evm() || + machine_is_omapl138_hawkboard()) sysclk = 24576000; else @@ -311,7 +312,8 @@ static int __init evm_init(void) } else if (machine_is_davinci_da830_evm()) { evm_snd_dev_data = &da830_evm_snd_devdata; index = 1; - } else if (machine_is_davinci_da850_evm()) { + } else if (machine_is_davinci_da850_evm() || + machine_is_omapl138_hawkboard()) { evm_snd_dev_data = &da850_evm_snd_devdata; index = 0; } else -- 1.6.0.5

2 1

[alsa-devel] Headphone jack and auto-mute of speak output
by Davyd McColl 09 Oct '10

09 Oct '10

Good day I'm new to this list (though I've done some searching, I'm sure I could have missed something), so please bear with me. I filed a bug report recently against Ubuntu with respect to the problem I'm experiencing (as per the subject: jacking in my headphones doesn't mute the speaker output) and was informed that the decision had been made upstream as a design intention. I was linked off to: http://mailman.alsa-project.org/pipermail/alsa-devel/2010-August/030071.html with respect to the thread on this topic. I'd like to raise it again though, perhaps as a configurable feature, for the following reasons: 1) headphones muting the speakers used to work some time ago (before Ubuntu 9.04, iirc), so we have an established user expectation even under Linux distros. 2) headphones mute the built-in speakers of my laptop (windows and ubuntu) -- why the inconsistent behaviour for a desktop? Just because the speakers in the laptop are bolted into the frame of the machine? 3) Windows "gets it right": plugging in headphones mutes external speakers -- it's convenient (Though I think you can disable that feature if you want). I'm told by a person at work that his Mac does the same. Again, the user expectation is unmet under a newish Linux distro. 4) The user expectation theory is held up by the number of bug reports against this design choice on Ubuntu Launchpad alone (I haven't looked at other bug lists). The average user is not expecting the current behaviour, obviously 5) For people without hardware volume controls on their speakers, the problem is exacerbated: instead of being able to plug in headphones to disturb others around them less (ie: contain their music/noises), they have to unplug their speakers too -- which may not be trivial since speakers are normally plugged in at the back of the machine, not at the front where the headphone jack would be found. On a machine in an enclosure, this is especially troublesome. So I'd really like to know if it would be possible to allow the behaviour most users are expecting. Sometimes it's useful to be able to output to both speakers and headphones, but I would say that the average user doesn't want both at the same time. -d -- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- The competent programmer is fully aware of the limited size of his own skull. He therefore approaches his task with full humility, and avoids clever tricks like the plague. - Djikstra.

3 6

[alsa-devel] [PATCH v1 4/6] davinci: SOUND support for Omapl138-Hawkboard
by vm.rod25＠gmail.com 09 Oct '10

09 Oct '10

From: Victor Rodriguez <victor.rodriguez(a)sasken.com> This patch adds sound support for the Hawkboard-L138 system It is under the machine name "omapl138_hawkboard". This system is based on the da850 davinci CPU architecture. Signed-off-by: Victor Rodriguez <victor.rodriguez(a)sasken.com> --- Notes: This patch works with da8xx_omapl_defconfig In order to test ALSA utils select in menuconfig like insmodule: Sound card support ---> Advanced Linux Sound Architecture ---> ALSA for SoC audio support ---> SoC Audio for the TI DAVINCI chip SoC Audio support for DA850/OMAP-L138 EVM/Hawkboard arch/arm/mach-davinci/board-omapl138-hawk.c | 46 +++++++++++++++++++++++++++ arch/arm/mach-davinci/da850.c | 2 +- 2 files changed, 47 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 01eef73..ba3718a 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/console.h> #include <linux/gpio.h> +#include <linux/i2c.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -116,6 +117,37 @@ static struct edma_rsv_info *da850_edma_rsv[2] = { &da850_edma_cc1_rsv, }; +static struct i2c_board_info __initdata omapl138_hawk_i2c_devices[] = { + { + I2C_BOARD_INFO("tlv320aic3x", 0x18), + }, +}; + +static struct davinci_i2c_platform_data omapl138_hawk_i2c_0_pdata = { + .bus_freq = 100, /* kHz */ + .bus_delay = 0, /* usec */ +}; + +/* davinci da850 evm audio machine driver */ +static u8 da850_iis_serializer_direction[] = { + INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, + INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, + INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, + INACTIVE_MODE, TX_MODE, RX_MODE, INACTIVE_MODE, +}; + +static struct snd_platform_data omapl138_hawk_snd_data = { + .tx_dma_offset = 0x2000, + .rx_dma_offset = 0x2000, + .op_mode = DAVINCI_MCASP_IIS_MODE, + .num_serializer = ARRAY_SIZE(da850_iis_serializer_direction), + .tdm_slots = 2, + .serial_dir = da850_iis_serializer_direction, + .asp_chan_q = EVENTQ_1, + .version = MCASP_VERSION_2, + .txnumevt = 1, + .rxnumevt = 1, +}; static struct davinci_uart_config omapl138_hawk_uart_config __initdata = { .enabled_uarts = 0x7, @@ -134,6 +166,20 @@ static __init void omapl138_hawk_init(void) ret = omapl138_hawk_config_emac(); + i2c_register_board_info(1, omapl138_hawk_i2c_devices, + ARRAY_SIZE(omapl138_hawk_i2c_devices)); + + ret = da8xx_register_i2c(0, &omapl138_hawk_i2c_0_pdata); + if (ret) + pr_warning("omapl138_hawk_init: " + "i2c0 registration failed: %d\n", ret); + + ret = davinci_cfg_reg_list(da850_mcasp_pins); + if (ret) + pr_warning("omapl138_hawk_init: " + "mcasp mux setup failed: %d\n", ret); + da8xx_register_mcasp(0, &omapl138_hawk_snd_data); + ret = da8xx_register_watchdog(); if (ret) pr_warning("omapl138_hawk_init: " diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 63916b9..f033a0a 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -591,7 +591,7 @@ const short da850_cpgmac_pins[] __initdata = { const short da850_mcasp_pins[] __initdata = { DA850_AHCLKX, DA850_ACLKX, DA850_AFSX, DA850_AHCLKR, DA850_ACLKR, DA850_AFSR, DA850_AMUTE, - DA850_AXR_11, DA850_AXR_12, + DA850_AXR_11, DA850_AXR_12, DA850_AXR_13, DA850_AXR_14, -1 }; -- 1.6.0.5

1 0

[alsa-devel] [PATCH v1 3/6] ASoC: davinci: ASoC support for Omapl138-Hawkboard
by vm.rod25＠gmail.com 09 Oct '10

09 Oct '10

From: Victor Rodriguez <victor.rodriguez(a)sasken.com> This patch adds ASoC support for the Hawkboard-L138 system It is under the machine name "omapl138_hawkboard". This system is based on the da850 davinci CPU architecture. Signed-off-by: Victor Rodriguez <victor.rodriguez(a)sasken.com> --- sound/soc/davinci/Kconfig | 5 +++-- sound/soc/davinci/davinci-evm.c | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig index 6bbf001..d6cb394 100644 --- a/sound/soc/davinci/Kconfig +++ b/sound/soc/davinci/Kconfig @@ -76,8 +76,9 @@ config SND_DA830_SOC_EVM DA830/OMAP-L137 EVM config SND_DA850_SOC_EVM - tristate "SoC Audio support for DA850/OMAP-L138 EVM" - depends on SND_DAVINCI_SOC && MACH_DAVINCI_DA850_EVM + tristate "SoC Audio support for DA850/OMAP-L138 EVM/Hawkboard" + depends on SND_DAVINCI_SOC&& (MACH_DAVINCI_DA850_EVM \ + || MACH_OMAPL138_HAWKBOARD) select SND_DAVINCI_SOC_MCASP select SND_SOC_TLV320AIC3X help diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 97f74d6..73093eb 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -59,7 +59,8 @@ static int evm_hw_params(struct snd_pcm_substream *substream, sysclk = 12288000; else if (machine_is_davinci_da830_evm() || - machine_is_davinci_da850_evm()) + machine_is_davinci_da850_evm() || + machine_is_omapl138_hawkboard()) sysclk = 24576000; else @@ -311,7 +312,8 @@ static int __init evm_init(void) } else if (machine_is_davinci_da830_evm()) { evm_snd_dev_data = &da830_evm_snd_devdata; index = 1; - } else if (machine_is_davinci_da850_evm()) { + } else if (machine_is_davinci_da850_evm() || + machine_is_omapl138_hawkboard()) { evm_snd_dev_data = &da850_evm_snd_devdata; index = 0; } else -- 1.6.0.5

1 0