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

[alsa-devel] [PATCH 2/2] ASOC: S5PV210: Enable AC97 support
by Jassi Brar 27 May '10

27 May '10

From: Jassi Brar <jassi.brar(a)samsung.com> The S5PV210 and S5PC110 has the AC97 controller same as S3C6410. Simply enable the options to build the drivers for S5PC110 and S5PV210 also. Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- sound/soc/s3c24xx/Kconfig | 4 ++-- sound/soc/s3c24xx/smdk_wm9713.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig index aa112d3..292d817 100644 --- a/sound/soc/s3c24xx/Kconfig +++ b/sound/soc/s3c24xx/Kconfig @@ -1,6 +1,6 @@ config SND_S3C24XX_SOC tristate "SoC Audio for the Samsung S3CXXXX chips" - depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 + depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 select S3C64XX_DMA if ARCH_S3C64XX help Say Y or M if you want to add support for codecs attached to @@ -120,7 +120,7 @@ config SND_S3C24XX_SOC_SIMTEC_HERMES config SND_SOC_SMDK_WM9713 tristate "SoC AC97 Audio support for SMDK with WM9713" - depends on SND_S3C24XX_SOC && (MACH_SMDK6410 || MACH_SMDKC100) + depends on SND_S3C24XX_SOC && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110) select SND_SOC_WM9713 select SND_S3C_SOC_AC97 help diff --git a/sound/soc/s3c24xx/smdk_wm9713.c b/sound/soc/s3c24xx/smdk_wm9713.c index 7dd85e5..5527b9e 100644 --- a/sound/soc/s3c24xx/smdk_wm9713.c +++ b/sound/soc/s3c24xx/smdk_wm9713.c @@ -26,6 +26,8 @@ static struct snd_soc_card smdk; * * SMDK6410: Set CFG1 1-3 On, CFG2 1-4 Off * SMDKC100: Set CFG6 1-3 On, CFG7 1 On + * SMDKC110: Set CFGB10 1-2 Off, CFGB12 1-3 On + * SMDKV210: Set CFGB10 1-2 Off, CFGB12 1-3 On */ /* -- 1.6.2.5

1 0

[alsa-devel] [RFC PATCH v2 0/3] ep93xx i2s audio
by Ryan Mallon 27 May '10

27 May '10

The following patch series adds support for i2s audio on the ep93xx, with the Snapper CL15 used as an example implementation. I have created psuedo clocks for sclk and lrclk as suggested by Hartley/Mark. This moves the sdiv/lrdiv calculation into ep93xx_i2s_hw_parms. The ep93xx documentation implies that lrclk is gated for unused bits (ie if lrdiv > word length). If this is true for all ep93xx i2s setups then the lrclk/sclk's could be replaced by a single audio rate clock. I have fixed the enabling/disabling of the i2s peripheral, which corrects the problem I was having with playback sometimes resulting in noise. I have also made a number of changes suggested from the first round of patches. Ryan Mallon (3): ep93xx i2s audio driver ep93xx i2s core support ep93xx i2s audio snapper cl15 support arch/arm/mach-ep93xx/clock.c | 69 ++++- arch/arm/mach-ep93xx/core.c | 31 ++ arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 10 + arch/arm/mach-ep93xx/include/mach/platform.h | 1 + arch/arm/mach-ep93xx/snappercl15.c | 1 + sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/ep93xx/Kconfig | 18 + sound/soc/ep93xx/Makefile | 11 + sound/soc/ep93xx/ep93xx-i2s.c | 489 +++++++++++++++++++++++ sound/soc/ep93xx/ep93xx-i2s.h | 25 ++ sound/soc/ep93xx/ep93xx-pcm.c | 323 +++++++++++++++ sound/soc/ep93xx/ep93xx-pcm.h | 22 + sound/soc/ep93xx/snappercl15.c | 143 +++++++ 14 files changed, 1144 insertions(+), 1 deletions(-) create mode 100644 sound/soc/ep93xx/Kconfig create mode 100644 sound/soc/ep93xx/Makefile create mode 100644 sound/soc/ep93xx/ep93xx-i2s.c create mode 100644 sound/soc/ep93xx/ep93xx-i2s.h create mode 100644 sound/soc/ep93xx/ep93xx-pcm.c create mode 100644 sound/soc/ep93xx/ep93xx-pcm.h create mode 100644 sound/soc/ep93xx/snappercl15.c

4 6

[alsa-devel] [patch 0/5] kirkwood openrd client audio support - v3
by apatard＠mandriva.com 27 May '10

27 May '10

Hi, It's a new try to get merged kirkwood openrd client support. The changes are : - set window configuration according to dma address - namespaced all cs42l51 #define - modified cs42l51_dac_names array according to what proposed Mark Brown - use SOC_DOUBLE_TLV for mic boost Arnaud

3 9

[PATCH 3/4] eukrea_mbimx27: add audio codec
by Eric Bénard 26 May '10

26 May '10

Signed-off-by: Eric Bénard <eric(a)eukrea.com> --- arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c | 44 +++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c b/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c index 34bdc26..471dbd2 100644 --- a/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c +++ b/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Eric Benard - eric(a)eukrea.com + * Copyright (C) 2009-2010 Eric Benard - eric(a)eukrea.com * * Based on pcm970-baseboard.c which is : * Copyright (C) 2008 Juergen Beisert (kernel(a)pengutronix.de) @@ -37,6 +37,8 @@ #include <mach/mmc.h> #include <mach/imx-uart.h> #include <mach/spi.h> +#include <mach/ssi.h> +#include <mach/audmux.h> #include "devices.h" @@ -93,6 +95,13 @@ static int eukrea_mbimx27_pins[] = { PD29_PF_CSPI1_SCLK, PD30_PF_CSPI1_MISO, PD31_PF_CSPI1_MOSI, + /* SSI4 */ +#if defined(CONFIG_SND_SOC_EUKREA_TLV320) + PC16_PF_SSI4_FS, + PC17_PF_SSI4_RXD | GPIO_PUEN, + PC18_PF_SSI4_TXD | GPIO_PUEN, + PC19_PF_SSI4_CLK, +#endif }; static const uint32_t eukrea_mbimx27_keymap[] = { @@ -287,6 +296,12 @@ static struct spi_board_info eukrea_mbimx27_spi_board_info[] __initdata = { }, }; +static struct i2c_board_info eukrea_mbimx27_i2c_devices[] = { + { + I2C_BOARD_INFO("tlv320aic23", 0x1a), + }, +}; + static int eukrea_mbimx27_spi_cs[] = {GPIO_PORTD | 28}; static struct spi_imx_master eukrea_mbimx27_spi_0_data = { @@ -303,6 +318,10 @@ static struct imxmmc_platform_data sdhc_pdata = { .dat3_card_detect = 1, }; +struct imx_ssi_platform_data eukrea_mbimx27_ssi_pdata = { + .flags = IMX_SSI_DMA, +}; + /* * system init for baseboard usage. Will be called by cpuimx27 init. * @@ -314,6 +333,24 @@ void __init eukrea_mbimx27_baseboard_init(void) mxc_gpio_setup_multiple_pins(eukrea_mbimx27_pins, ARRAY_SIZE(eukrea_mbimx27_pins), "MBIMX27"); +#if defined(CONFIG_SND_SOC_EUKREA_TLV320) + /* SSI unit master I2S codec connected to SSI_PINS_4*/ + mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0, + MXC_AUDMUX_V1_PCR_SYN | + MXC_AUDMUX_V1_PCR_TFSDIR | + MXC_AUDMUX_V1_PCR_TCLKDIR | + MXC_AUDMUX_V1_PCR_RFSDIR | + MXC_AUDMUX_V1_PCR_RCLKDIR | + MXC_AUDMUX_V1_PCR_TFCSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) | + MXC_AUDMUX_V1_PCR_RFCSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) | + MXC_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) + ); + mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR3_SSI_PINS_4, + MXC_AUDMUX_V1_PCR_SYN | + MXC_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR1_SSI0) + ); +#endif + mxc_register_device(&mxc_uart_device1, &uart_pdata[0]); mxc_register_device(&mxc_uart_device2, &uart_pdata[1]); #if !defined(MACH_EUKREA_CPUIMX27_USEUART4) @@ -323,6 +360,11 @@ void __init eukrea_mbimx27_baseboard_init(void) mxc_register_device(&mxc_fb_device, &eukrea_mbimx27_fb_data); mxc_register_device(&mxc_sdhc_device0, &sdhc_pdata); + i2c_register_board_info(0, eukrea_mbimx27_i2c_devices, + ARRAY_SIZE(eukrea_mbimx27_i2c_devices)); + + mxc_register_device(&imx_ssi_device0, &eukrea_mbimx27_ssi_pdata); + #if defined(CONFIG_TOUCHSCREEN_ADS7846) \ || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE) /* ADS7846 Touchscreen controller init */ -- 1.6.3.3 --------------010207020109090402010001--

1 0

[PATCH 2/4] soc/imx: add eukrea-tlv320
by Eric Bénard 26 May '10

26 May '10

Add the necessary files to support the TLV320AIC23B wired in I2S on our i.MX platforms. Signed-off-by: Eric Bénard <eric(a)eukrea.com> --- sound/soc/imx/Kconfig | 8 +++ sound/soc/imx/Makefile | 2 + sound/soc/imx/eukrea-tlv320.c | 131 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+), 0 deletions(-) create mode 100644 sound/soc/imx/eukrea-tlv320.c diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig index 7174b4c..3e27b16 100644 --- a/sound/soc/imx/Kconfig +++ b/sound/soc/imx/Kconfig @@ -11,3 +11,11 @@ config SND_IMX_SOC config SND_MXC_SOC_SSI tristate +config SND_SOC_EUKREA_TLV320 + bool "Eukrea TLV320" + depends on MACH_EUKREA_MBIMX27_BASEBOARD + select SND_IMX_SOC + select SND_SOC_TLV320AIC23 + help + Enable I2S based access to the TLV320AIC23B codec attached + to the SSI4 interface diff --git a/sound/soc/imx/Makefile b/sound/soc/imx/Makefile index 9f8bb92..28d4b1e 100644 --- a/sound/soc/imx/Makefile +++ b/sound/soc/imx/Makefile @@ -10,3 +10,5 @@ obj-$(CONFIG_SND_IMX_SOC) += snd-soc-imx.o # i.MX Machine Support snd-soc-phycore-ac97-objs := phycore-ac97.o obj-$(CONFIG_SND_SOC_PHYCORE_AC97) += snd-soc-phycore-ac97.o +snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o +obj-$(CONFIG_SND_SOC_EUKREA_TLV320) += snd-soc-eukrea-tlv320.o diff --git a/sound/soc/imx/eukrea-tlv320.c b/sound/soc/imx/eukrea-tlv320.c new file mode 100644 index 0000000..e368787 --- /dev/null +++ b/sound/soc/imx/eukrea-tlv320.c @@ -0,0 +1,131 @@ +/* + * eukrea-tlv320.c -- SoC audio for eukrea_cpuimxXX in I2S mode + * + * Copyright 2010 Eric Bénard, Eukréa Electromatique <eric(a)eukrea.com> + * + * based on sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c + * which is Copyright 2009 Simtec Electronics + * and on sound/soc/imx/phycore-ac97.c which is + * Copyright 2009 Sascha Hauer, Pengutronix <s.hauer(a)pengutronix.de> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + */ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/device.h> +#include <linux/i2c.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> +#include <asm/mach-types.h> + +#include "../codecs/tlv320aic23.h" +#include "imx-ssi.h" + +#define CODEC_CLOCK 12000000 + +static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; + struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; + int ret; + + /* Set the CODEC as the bus clock master, I2S */ + ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM); + if (ret) { + pr_err("%s: failed set cpu dai format\n", __func__); + return ret; + } + + /* Set the CODEC as the bus clock master */ + ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM); + if (ret) { + pr_err("%s: failed set codec dai format\n", __func__); + return ret; + } + + /* Set the codec system clock for DAC and ADC */ + ret = snd_soc_dai_set_sysclk(codec_dai, 0, + CODEC_CLOCK, SND_SOC_CLOCK_IN); + if (ret) { + pr_err("%s: failed setting codec sysclk\n", __func__); + return ret; + } + + return 0; +} + +static struct snd_soc_ops eukrea_tlv320_snd_ops = { + .hw_params = eukrea_tlv320_hw_params, +}; + +static struct snd_soc_dai_link eukrea_tlv320_dai = { + .name = "tlv320aic23", + .stream_name = "TLV320AIC23", + .codec_dai = &tlv320aic23_dai, + .ops = &eukrea_tlv320_snd_ops, +}; + +static struct snd_soc_card eukrea_tlv320 = { + .name = "cpuimx-audio", + .platform = &imx_soc_platform, + .dai_link = &eukrea_tlv320_dai, + .num_links = 1, +}; + +static struct snd_soc_device eukrea_tlv320_snd_devdata = { + .card = &eukrea_tlv320, + .codec_dev = &soc_codec_dev_tlv320aic23, +}; + +static struct platform_device *eukrea_tlv320_snd_device; + +static int __init eukrea_tlv320_init(void) +{ + int ret; + + if (!machine_is_eukrea_cpuimx27()) + /* return happy. We might run on a totally different machine */ + return 0; + + eukrea_tlv320_snd_device = platform_device_alloc("soc-audio", -1); + if (!eukrea_tlv320_snd_device) + return -ENOMEM; + + eukrea_tlv320_dai.cpu_dai = &imx_ssi_pcm_dai[0]; + + platform_set_drvdata(eukrea_tlv320_snd_device, &eukrea_tlv320_snd_devdata); + eukrea_tlv320_snd_devdata.dev = &eukrea_tlv320_snd_device->dev; + ret = platform_device_add(eukrea_tlv320_snd_device); + + if (ret) { + printk(KERN_ERR "ASoC: Platform device allocation failed\n"); + platform_device_put(eukrea_tlv320_snd_device); + } + + return ret; +} + +static void __exit eukrea_tlv320_exit(void) +{ + platform_device_unregister(eukrea_tlv320_snd_device); +} + +module_init(eukrea_tlv320_init); +module_exit(eukrea_tlv320_exit); + +MODULE_AUTHOR("Eric Bénard <eric(a)eukrea.com>"); +MODULE_DESCRIPTION("CPUIMX ALSA SoC driver"); +MODULE_LICENSE("GPL"); -- 1.6.3.3 --------------010207020109090402010001 Content-Type: text/x-patch; name="0003-eukrea_mbimx27-add-audio-codec.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0003-eukrea_mbimx27-add-audio-codec.patch"

1 0

Re: [alsa-devel] CX20582 (Pebble) and Thinkpad x100e...
by Tobin Davis 26 May '10

26 May '10

I'm forwarding this on to the alsa-devel mailing list as I am not personally maintaining this driver at this time. If you could also download alsa-info.sh from http://alsa-project.org, run it, and post the results to the mailing list that would be great. -- Tobin Davis "Look! There! Evil!.. pure and simple, total evil from the Eighth Dimension!" -- Buckaroo Banzai On Mon, 2010-05-24 at 22:20 +0300, Hakan Kızılhan wrote: > Pototskiy Akex > Takashi Iwai > Tobin Davis > > Hi, > > I am Hakan from Turkey. If no drawback, i want to ask for a hardware problem. > > I have AMD based Thinkpad x100e and this machine have Conexant CX20582 > (Pebble) sound card. > Using Ubuntu 10.04 and microphones doesn't work. I have readed following bug: > > https://bugs.launchpad.net/ubuntu/+source/alsa-driver/+bug/549289 > > options snd-hda-intel model="olpc-xo-1_5" enables output > jack(headphones) but microphones not. > i dont capture sound anyway. > > i saw "sound/pci/hda/patch_conexant.c" related patches for different models. > > So, is it posible to patch this file for Thinkpad x100e model? > May i send hardware specific information for patch? And what should i send? > > Thanks a lot... > > ____________ > Hakan Kizilhan

2 1

Re: [alsa-devel] [patch 4/5] orion/kirkwood: Add i2s support
by Arnaud Patard 26 May '10

26 May '10

Nicolas Pitre <nico(a)fluxnic.net> writes: Hi, > On Tue, 25 May 2010, apatard(a)mandriva.com wrote: > >> This patch enables support for the i2s controller available on orion/kirkwood platforms >> >> Signed-off-by: Arnaud Patard <apatard(a)mandriva.com> > > The actual Orion processor family has no I2S/audio support. It would be > better if all the audio related stuff was renamed to "kirkwood" and > "KIRKWOOD_*" instead. I've been told there was some orion with audio. As I've never looked at the orion family in details, I assumed this is right and I've changed the naming accordingly. I can change again but it would be nice to have an agreement here. Who's/what's right ? orion can or can not have i2s audio ? Arnaud

1 0

[alsa-devel] [PATCH 0/7] ASoC: TWL4030: put the codec to off when not active
by Peter Ujfalusi 26 May '10

26 May '10

Hello, The following series at the end will let the twl4030 codec to use BIAS_OFF instead of BIAS_STANDBY. The difference in power consumption is about 0.5mA. To achieve this: - The regcache has been reseted to codec default - The codec initialization has been optimized, it is no longer writes all 73 registers at startup, but only modifies few selected one. - The power related code has been cleaned up, and optimized - Support added for machine drivers to select the offset cancellation path - debug support for checking the codec default registers (machine drivers can ask for checking, but shall be disabled in production). I guess that's it. The driver has been tested on a custom board with twl5031. It passed all of our internal test cases covering much of the codec features. --- Peter Ujfalusi (7): ASoC: TWL4030: Revisit codec defaults ASoC: TWL4030: Remove wrapper for power down ASoC: TWL4030: Make offset cancellation path configurable ASoC: TWL4030: Optimize the power up sequence ASoC: TWL4030: Helper to check chip default registers ASoC: TWL4030: Correct the ARXR2_APGA_CTL chip default ASoC: TWL4030: Use BIAS_OFF instead of BIAS_STANDBY, when not in use sound/soc/codecs/twl4030.c | 286 ++++++++++++++++++++++++-------------------- sound/soc/codecs/twl4030.h | 2 + 2 files changed, 157 insertions(+), 131 deletions(-)

3 16

Re: [alsa-devel] [patch 4/5] orion/kirkwood: Add i2s support
by saeed bishara 26 May '10

26 May '10

On Wed, May 26, 2010 at 3:31 AM, Nicolas Pitre <nico(a)fluxnic.net> wrote: > On Tue, 25 May 2010, apatard(a)mandriva.com wrote: > >> This patch enables support for the i2s controller available on orion/kirkwood platforms >> >> Signed-off-by: Arnaud Patard <apatard(a)mandriva.com> > > The actual Orion processor family has no I2S/audio support. It would be > better if all the audio related stuff was renamed to "kirkwood" and > "KIRKWOOD_*" instead. This i2s was first included in orion90L (6183). saeed

1 0

Re: [alsa-devel] [patch 0/5] kirkwood openrd client audio support - v3
by Mark Brown 26 May '10

26 May '10

On Tue, May 25, 2010 at 09:10:54PM -0400, Nicolas Pitre wrote: > I don't mind if you wish to carry it through the ASOC tree. The bulk of > it is ASOC related anyway. However I think that "orion" names should be > "kirkwood" throughout instead, as pure Orion chips have no audio > interfaces. Can I add an ack from you for the patches with the name change, then?

1 0