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

[alsa-devel] [PATCH 01/16] ASoC: core: Add multi reg control struct & macros
by Ola Lilja 22 Mar '12

22 Mar '12

From: Kristoffer KARLSSON <kristoffer.karlsson(a)stericsson.com> Add support for controls that exposes a single signed value while spanning multiple codec registers in a MSB/LSB manner. Definition of a generic control struct added. soc_mreg_control Also four generic convenience macros added: SOC_SINGLE_VALUE_S1R One control value spans one register SOC_SINGLE_VALUE_S2R One control value spans two registers SOC_SINGLE_VALUE_S4R One control value spans four registers SOC_SINGLE_VALUE_S8R One control value spans eight registers Signed-off-by: Kristoffer KARLSSON <kristoffer.karlsson(a)stericsson.com> --- include/sound/soc.h | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 0992dff..dac20e0 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -185,6 +185,29 @@ .rreg = xreg_right, .shift = xshift, \ .min = xmin, .max = xmax} } +#define SOC_SINGLE_VALUE_S1R(xreg0, xcount, xmin, xmax, xinvert) \ + ((unsigned long)&(struct soc_mreg_control) \ + { .reg = ((unsigned int[]){ xreg0 }), \ + .rcount = 1, .count = xcount, \ + .invert = xinvert, .min = xmin, .max = xmax}) +#define SOC_SINGLE_VALUE_S2R(xreg0, xreg1, xcount, xmin, xmax, xinvert) \ + ((unsigned long)&(struct soc_mreg_control) \ + {.reg = ((unsigned int[]){ xreg0, xreg1 }), \ + .rcount = 2, .count = xcount, \ + .min = xmin, .max = xmax, .invert = xinvert}) +#define SOC_SINGLE_VALUE_S4R(xreg0, xreg1, xreg2, xreg3, \ + xcount, xmin, xmax, xinvert) \ + ((unsigned long)&(struct soc_mreg_control) \ + {.reg = ((unsigned int[]){ xreg0, xreg1, xreg2, xreg3 }), \ + .rcount = 4, .count = xcount, \ + .min = xmin, .max = xmax, .invert = xinvert}) +#define SOC_SINGLE_VALUE_S8R(xreg0, xreg1, xreg2, xreg3, xreg4, \ + xreg5, xreg6, xreg7, xcount, xmin, xmax, xinvert) \ + ((unsigned long)&(struct soc_mreg_control) \ + {.reg = ((unsigned int[]){ xreg0, xreg1, xreg2, xreg3, \ + xreg4, xreg5, xreg6, xreg7 }), \ + .rcount = 8, .count = xcount, \ + .min = xmin, .max = xmax, .invert = xinvert}) /* * Simplified versions of above macros, declaring a struct and calculating @@ -875,6 +898,13 @@ struct soc_mixer_control { unsigned int reg, rreg, shift, rshift, invert; }; +/* multi register control */ +struct soc_mreg_control { + long min, max; + unsigned int rcount, count, invert; + unsigned int *reg; +}; + /* enumerated kcontrol */ struct soc_enum { unsigned short reg; -- 1.7.8.3

4 37

Re: [alsa-devel] [PATCH] ASoC: Add extra parameter to device_prep_dma_cyclic
by Mark Brown 22 Mar '12

22 Mar '12

On Thu, Mar 22, 2012 at 10:19:03AM -0300, Fabio Estevam wrote: > Since commit 185ecb5 (dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic) > prep_dma_cyclic() got an extra context parameter. Applied, thanks.

1 0

Re: [alsa-devel] trying to get an eleven rack to work
by Clemens Ladisch 22 Mar '12

22 Mar '12

David Alexander wrote: > didn't seem to make any difference Are there any error messages in the system log when you're loading the driver? Regards, Clemens

1 0

[alsa-devel] [PATCH] ASoC: da7210: Add support for spi regmap
by Ashish Chavan 21 Mar '12

21 Mar '12

This patch adds support for spi regmap feature to existing da7210 driver. Signed-off-by: Ashish Chavan <ashish.chavan(a)kpitcummins.com> Signed-off-by: David Dajun Chen <dchen(a)diasemi.com> --- sound/soc/codecs/da7210.c | 90 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c index 7843711..0f13fc4 100644 --- a/sound/soc/codecs/da7210.c +++ b/sound/soc/codecs/da7210.c @@ -17,6 +17,7 @@ #include <linux/delay.h> #include <linux/i2c.h> +#include <linux/spi/spi.h> #include <linux/regmap.h> #include <linux/slab.h> #include <linux/module.h> @@ -905,6 +906,9 @@ static int da7210_probe(struct snd_soc_codec *codec) { struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec); int ret; +#if defined(CONFIG_SPI_MASTER) + unsigned int val; +#endif dev_info(codec->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION); @@ -927,10 +931,23 @@ static int da7210_probe(struct snd_soc_codec *codec) * DA7210_PLL_DIV3 :: DA7210_MCLK_RANGExxx */ +#if defined(CONFIG_SPI_MASTER) + /* Dummy read to give two pulses over nCS */ + regmap_read(da7210->regmap, DA7210_STATUS, &val); + regmap_read(da7210->regmap, DA7210_STATUS, &val); + regmap_read(da7210->regmap, DA7210_STATUS, &val); +#endif + /* * make sure that DA7210 use bypass mode before start up */ snd_soc_write(codec, DA7210_STARTUP1, 0); + +#if defined(CONFIG_SPI_MASTER) + /* Dummy read to complete last write operation */ + regmap_read(da7210->regmap, DA7210_STATUS, &val); +#endif + snd_soc_write(codec, DA7210_PLL_DIV3, DA7210_MCLK_RANGE_10_20_MHZ | DA7210_PLL_BYP); @@ -1025,6 +1042,10 @@ static int da7210_probe(struct snd_soc_codec *codec) DA7210_MCLK_RANGE_10_20_MHZ | DA7210_PLL_BYP); snd_soc_update_bits(codec, DA7210_PLL, DA7210_PLL_EN, DA7210_PLL_EN); +#if defined(CONFIG_SPI_MASTER) + snd_soc_write(codec, 0x00, 0x80); +#endif + /* As suggested by Dialog */ /* unlock */ regmap_write(da7210->regmap, DA7210_A_HID_UNLOCK, 0x8B); @@ -1035,6 +1056,10 @@ static int da7210_probe(struct snd_soc_codec *codec) regmap_write(da7210->regmap, DA7210_A_HID_UNLOCK, 0x00); regmap_write(da7210->regmap, DA7210_A_TEST_UNLOCK, 0x00); +#if defined(CONFIG_SPI_MASTER) + snd_soc_write(codec, 0x00, 0x00); +#endif + /* Activate all enabled subsystem */ snd_soc_write(codec, DA7210_STARTUP1, DA7210_SC_MST_EN); @@ -1128,12 +1153,74 @@ static struct i2c_driver da7210_i2c_driver = { }; #endif +#if defined(CONFIG_SPI_MASTER) +static int __devinit da7210_spi_probe(struct spi_device *spi) +{ + struct da7210_priv *da7210; + int ret; + + da7210 = kzalloc(sizeof(struct da7210_priv), GFP_KERNEL); + if (!da7210) + return -ENOMEM; + + spi_set_drvdata(spi, da7210); + + da7210_regmap.read_flag_mask = 0x01; + da7210_regmap.write_flag_mask = 0x00; + da7210->regmap = regmap_init_spi(spi, &da7210_regmap); + if (IS_ERR(da7210->regmap)) { + ret = PTR_ERR(da7210->regmap); + dev_err(&spi->dev, "Failed to register regmap: %d\n", ret); + goto err_alloc; + } + + ret = snd_soc_register_codec(&spi->dev, + &soc_codec_dev_da7210, &da7210_dai, 1); + if (ret < 0) + goto err_regmap; + + return ret; + +err_regmap: + regmap_exit(da7210->regmap); +err_alloc: + kfree(da7210); + + return ret; +} + +static int __devexit da7210_spi_remove(struct spi_device *spi) +{ + struct da7210_priv *da7210 = spi_get_drvdata(spi); + snd_soc_unregister_codec(&spi->dev); + regmap_exit(da7210->regmap); + kfree(da7210); + return 0; +} + +static struct spi_driver da7210_spi_driver = { + .driver = { + .name = "da7210-codec", + .owner = THIS_MODULE, + }, + .probe = da7210_spi_probe, + .remove = __devexit_p(da7210_spi_remove) +}; +#endif + static int __init da7210_modinit(void) { int ret = 0; #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) ret = i2c_add_driver(&da7210_i2c_driver); #endif +#if defined(CONFIG_SPI_MASTER) + ret = spi_register_driver(&da7210_spi_driver); + if (ret) { + printk(KERN_ERR "Failed to register da7210 SPI driver: %d\n", + ret); + } +#endif return ret; } module_init(da7210_modinit); @@ -1143,6 +1230,9 @@ static void __exit da7210_exit(void) #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) i2c_del_driver(&da7210_i2c_driver); #endif +#if defined(CONFIG_SPI_MASTER) + spi_unregister_driver(&da7210_spi_driver); +#endif } module_exit(da7210_exit); -- 1.7.1

2 5

[alsa-devel] [PATCH] [v3] powerpc/8xxx: remove 85xx/86xx restrictions from fsl_guts.h
by Timur Tabi 21 Mar '12

21 Mar '12

Remove the check for CONFIG_PPC_85xx and CONFIG_PPC_86xx from fsl_guts.h. The check was originally intended to allow the same header file to be used on 85xx and 86xx systems, even though the Global Utilities register could be different. It turns out that they're not actually different, and so the check is not necessary. In addition, neither macro is defined for 64-bit e5500 kernels, so that causes a build break. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- The ASoC part of this patch applies cleanly to the ASoC for-3.4 branch, so this patch should not cause any merge conflicts if carried on the PowerPC branch, so I suggest that Kumar pick this up for 3.4 (it fixes a potential 64-bit book-e build break), with an ACK from Mark. arch/powerpc/include/asm/fsl_guts.h | 26 +++++--------------------- arch/powerpc/platforms/85xx/mpc85xx_mds.c | 2 +- arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 2 +- arch/powerpc/platforms/85xx/p1022_ds.c | 4 ++-- arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 +- sound/soc/fsl/mpc8610_hpcd.c | 8 ++++---- sound/soc/fsl/p1022_ds.c | 10 +++++----- 7 files changed, 19 insertions(+), 35 deletions(-) diff --git a/arch/powerpc/include/asm/fsl_guts.h b/arch/powerpc/include/asm/fsl_guts.h index ce04530..aa4c488 100644 --- a/arch/powerpc/include/asm/fsl_guts.h +++ b/arch/powerpc/include/asm/fsl_guts.h @@ -16,15 +16,6 @@ #define __ASM_POWERPC_FSL_GUTS_H__ #ifdef __KERNEL__ -/* - * These #ifdefs are safe because it's not possible to build a kernel that - * runs on e500 and e600 cores. - */ - -#if !defined(CONFIG_PPC_85xx) && !defined(CONFIG_PPC_86xx) -#error Only 85xx and 86xx SOCs are supported -#endif - /** * Global Utility Registers. * @@ -36,11 +27,7 @@ * different names. In these cases, one name is chosen to avoid extraneous * #ifdefs. */ -#ifdef CONFIG_PPC_85xx -struct ccsr_guts_85xx { -#else -struct ccsr_guts_86xx { -#endif +struct ccsr_guts { __be32 porpllsr; /* 0x.0000 - POR PLL Ratio Status Register */ __be32 porbmsr; /* 0x.0004 - POR Boot Mode Status Register */ __be32 porimpscr; /* 0x.0008 - POR I/O Impedance Status and Control Register */ @@ -77,11 +64,8 @@ struct ccsr_guts_86xx { u8 res0a8[0xb0 - 0xa8]; __be32 rstcr; /* 0x.00b0 - Reset Control Register */ u8 res0b4[0xc0 - 0xb4]; -#ifdef CONFIG_PPC_85xx - __be32 iovselsr; /* 0x.00c0 - I/O voltage select status register */ -#else - __be32 elbcvselcr; /* 0x.00c0 - eLBC Voltage Select Ctrl Reg */ -#endif + __be32 iovselsr; /* 0x.00c0 - I/O voltage select status register + Called 'elbcvselcr' on 86xx SOCs */ u8 res0c4[0x224 - 0xc4]; __be32 iodelay1; /* 0x.0224 - IO delay control register 1 */ __be32 iodelay2; /* 0x.0228 - IO delay control register 2 */ @@ -136,7 +120,7 @@ struct ccsr_guts_86xx { * ch: The channel on the DMA controller (0, 1, 2, or 3) * device: The device to set as the source (CCSR_GUTS_DMACR_DEV_xx) */ -static inline void guts_set_dmacr(struct ccsr_guts_86xx __iomem *guts, +static inline void guts_set_dmacr(struct ccsr_guts __iomem *guts, unsigned int co, unsigned int ch, unsigned int device) { unsigned int shift = 16 + (8 * (1 - co) + 2 * (3 - ch)); @@ -172,7 +156,7 @@ static inline void guts_set_dmacr(struct ccsr_guts_86xx __iomem *guts, * ch: The channel on the DMA controller (0, 1, 2, or 3) * value: the new value for the bit (0 or 1) */ -static inline void guts_set_pmuxcr_dma(struct ccsr_guts_86xx __iomem *guts, +static inline void guts_set_pmuxcr_dma(struct ccsr_guts __iomem *guts, unsigned int co, unsigned int ch, unsigned int value) { if ((ch == 0) || (ch == 3)) { diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c index f33662b..e82f06f 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c @@ -271,7 +271,7 @@ static void __init mpc85xx_mds_qe_init(void) if (machine_is(p1021_mds)) { - struct ccsr_guts_85xx __iomem *guts; + struct ccsr_guts __iomem *guts; np = of_find_node_by_name(NULL, "global-utilities"); if (np) { diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c index db214cd..1a66c3d 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c @@ -128,7 +128,7 @@ static void __init mpc85xx_rdb_setup_arch(void) #if defined(CONFIG_UCC_GETH) || defined(CONFIG_SERIAL_QE) if (machine_is(p1025_rdb)) { - struct ccsr_guts_85xx __iomem *guts; + struct ccsr_guts __iomem *guts; np = of_find_node_by_name(NULL, "global-utilities"); if (np) { diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c index 0fe88e3..e74b7cd 100644 --- a/arch/powerpc/platforms/85xx/p1022_ds.c +++ b/arch/powerpc/platforms/85xx/p1022_ds.c @@ -150,7 +150,7 @@ static void p1022ds_set_monitor_port(enum fsl_diu_monitor_port port) { struct device_node *guts_node; struct device_node *indirect_node = NULL; - struct ccsr_guts_85xx __iomem *guts; + struct ccsr_guts __iomem *guts; u8 __iomem *lbc_lcs0_ba = NULL; u8 __iomem *lbc_lcs1_ba = NULL; u8 b; @@ -269,7 +269,7 @@ exit: void p1022ds_set_pixel_clock(unsigned int pixclock) { struct device_node *guts_np = NULL; - struct ccsr_guts_85xx __iomem *guts; + struct ccsr_guts __iomem *guts; unsigned long freq; u64 temp; u32 pxclk; diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c index 13fa9a6..b8b1f33 100644 --- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c +++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c @@ -226,7 +226,7 @@ void mpc8610hpcd_set_monitor_port(enum fsl_diu_monitor_port port) void mpc8610hpcd_set_pixel_clock(unsigned int pixclock) { struct device_node *guts_np = NULL; - struct ccsr_guts_86xx __iomem *guts; + struct ccsr_guts __iomem *guts; unsigned long freq; u64 temp; u32 pxclk; diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c index 0ea4a5a..1f4c3b7 100644 --- a/sound/soc/fsl/mpc8610_hpcd.c +++ b/sound/soc/fsl/mpc8610_hpcd.c @@ -58,9 +58,9 @@ static int mpc8610_hpcd_machine_probe(struct snd_soc_card *card) { struct mpc8610_hpcd_data *machine_data = container_of(card, struct mpc8610_hpcd_data, card); - struct ccsr_guts_86xx __iomem *guts; + struct ccsr_guts __iomem *guts; - guts = ioremap(guts_phys, sizeof(struct ccsr_guts_86xx)); + guts = ioremap(guts_phys, sizeof(struct ccsr_guts)); if (!guts) { dev_err(card->dev, "could not map global utilities\n"); return -ENOMEM; @@ -142,9 +142,9 @@ static int mpc8610_hpcd_machine_remove(struct snd_soc_card *card) { struct mpc8610_hpcd_data *machine_data = container_of(card, struct mpc8610_hpcd_data, card); - struct ccsr_guts_86xx __iomem *guts; + struct ccsr_guts __iomem *guts; - guts = ioremap(guts_phys, sizeof(struct ccsr_guts_86xx)); + guts = ioremap(guts_phys, sizeof(struct ccsr_guts)); if (!guts) { dev_err(card->dev, "could not map global utilities\n"); return -ENOMEM; diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c index a5d4e80..d0dee59 100644 --- a/sound/soc/fsl/p1022_ds.c +++ b/sound/soc/fsl/p1022_ds.c @@ -46,7 +46,7 @@ * ch: The channel on the DMA controller (0, 1, 2, or 3) * device: The device to set as the target (CCSR_GUTS_DMUXCR_xxx) */ -static inline void guts_set_dmuxcr(struct ccsr_guts_85xx __iomem *guts, +static inline void guts_set_dmuxcr(struct ccsr_guts __iomem *guts, unsigned int co, unsigned int ch, unsigned int device) { unsigned int shift = 16 + (8 * (1 - co) + 2 * (3 - ch)); @@ -90,9 +90,9 @@ static int p1022_ds_machine_probe(struct snd_soc_card *card) { struct machine_data *mdata = container_of(card, struct machine_data, card); - struct ccsr_guts_85xx __iomem *guts; + struct ccsr_guts __iomem *guts; - guts = ioremap(guts_phys, sizeof(struct ccsr_guts_85xx)); + guts = ioremap(guts_phys, sizeof(struct ccsr_guts)); if (!guts) { dev_err(card->dev, "could not map global utilities\n"); return -ENOMEM; @@ -164,9 +164,9 @@ static int p1022_ds_machine_remove(struct snd_soc_card *card) { struct machine_data *mdata = container_of(card, struct machine_data, card); - struct ccsr_guts_85xx __iomem *guts; + struct ccsr_guts __iomem *guts; - guts = ioremap(guts_phys, sizeof(struct ccsr_guts_85xx)); + guts = ioremap(guts_phys, sizeof(struct ccsr_guts)); if (!guts) { dev_err(card->dev, "could not map global utilities\n"); return -ENOMEM; -- 1.7.10.rc1.8.ga99c5.dirty

3 2

[alsa-devel] [PATCH v8] sound/soc/lapis: add machine driver for ML7213 Carrier Board
by Tomoya MORINAGA 21 Mar '12

21 Mar '12

This machine driver is for LAPIS Semiconductor ML7213 Carrier Board + ML26124 Reference Board Signed-off-by: Tomoya MORINAGA <tomoya.rohm(a)gmail.com> --- v8 - Delete redundant break - Use module_platform_driver - Delete redundant 'space' - Delete snd_soc_dapm_enable_pin()s --- sound/soc/lapis/Kconfig | 7 ++ sound/soc/lapis/Makefile | 2 + sound/soc/lapis/ml7213ioh-machine.c | 169 +++++++++++++++++++++++++++++++++++ 3 files changed, 178 insertions(+), 0 deletions(-) create mode 100644 sound/soc/lapis/ml7213ioh-machine.c diff --git a/sound/soc/lapis/Kconfig b/sound/soc/lapis/Kconfig index 551e385..9bc1b4d 100644 --- a/sound/soc/lapis/Kconfig +++ b/sound/soc/lapis/Kconfig @@ -2,3 +2,10 @@ config SND_SOC_ML7213_PLATFORM tristate "ML7213 IOH ASoC platform driver" help This option enables support for the AC Link Controllers in ML7213 IOH SoC. + +config SND_SOC_ML7213_MACHINE + tristate "ML7213 IOH ASoC machine driver" + select SND_SOC_ML7213_PLATFORM + select SND_SOC_ML26124 + help + This is ASoC machine driver for ML7213 IOH diff --git a/sound/soc/lapis/Makefile b/sound/soc/lapis/Makefile index aba1630..7ec4bea 100644 --- a/sound/soc/lapis/Makefile +++ b/sound/soc/lapis/Makefile @@ -1,4 +1,6 @@ # Platform +snd-soc-ml7213-machine-objs := ml7213ioh-machine.o snd-soc-ml7213-plat-objs := ml7213ioh-plat.o obj-$(CONFIG_SND_SOC_ML7213_PLATFORM) += snd-soc-ml7213-plat.o +obj-$(CONFIG_SND_SOC_ML7213_MACHINE) += snd-soc-ml7213-machine.o diff --git a/sound/soc/lapis/ml7213ioh-machine.c b/sound/soc/lapis/ml7213ioh-machine.c new file mode 100644 index 0000000..14f83d2 --- /dev/null +++ b/sound/soc/lapis/ml7213ioh-machine.c @@ -0,0 +1,169 @@ +/* + * ml7213ioh-machine.c -- SoC Audio for LAPIS Semiconductor ML7213 IOH CRB + * + * Copyright (C) 2011 LAPIS Semiconductor Co., Ltd. + * + * 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; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ +#include <linux/module.h> +#include <linux/platform_device.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/pcm_params.h> +#include <linux/i2c.h> +#include "../codecs/ml26124.h" +#include "ioh_i2s.h" + +static const struct snd_soc_dapm_widget ml7213_dapm_widgets[] = { + SND_SOC_DAPM_SPK("Speaker", NULL), + SND_SOC_DAPM_LINE("LINEOUT", NULL), + SND_SOC_DAPM_LINE("LINEIN", NULL), + SND_SOC_DAPM_MIC("AnalogMIC", NULL), + SND_SOC_DAPM_MIC("DigitalMIC", NULL), +}; + +static const struct snd_soc_dapm_route ml7213_routes[] = { + {"Speaker", NULL, "SPOUT"}, + {"LINEOUT", NULL, "LOUT"}, + {"AnalogMIC", NULL, "MICBIAS"}, + {"MIN", NULL, "AnalogMIC"}, + {"MDIN", NULL, "DigitalMIC"}, + {"MIN", NULL, "LINEIN"}, +}; + +static int ml7213_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *hw_params) +{ + int bclkfs; + int mclkfs; + unsigned int clk; + int ret; + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + unsigned int channel_map[] = {5, 0, 1, 2, 3, 4}; + + /* set cpu DAI channel mapping */ + ret = snd_soc_dai_set_channel_map(cpu_dai, ARRAY_SIZE(channel_map), + channel_map, ARRAY_SIZE(channel_map), channel_map); + if (ret < 0) + return ret; + + switch (params_rate(hw_params)) { + case 16000: + case 32000: + case 48000: + clk = 12288000; + break; + default: + return -EINVAL; + } + + mclkfs = clk / params_rate(hw_params); + + switch (params_format(hw_params)) { + case SNDRV_PCM_FORMAT_U8: + case SNDRV_PCM_FORMAT_S16_LE: + bclkfs = 32; + break; + case SNDRV_PCM_FORMAT_S32_LE: + bclkfs = 64; + break; + default: + pr_err("%s: Failed not support format\n", __func__); + return -EINVAL; + } + + /* set the codec system clock for DAC and ADC */ + ret = snd_soc_dai_set_sysclk(codec_dai, ML26124_USE_PLLOUT, clk, + SND_SOC_CLOCK_IN); + if (ret < 0) + return ret; + + /* set codec DAI configuration */ + ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS); + if (ret < 0) + return ret; + + /* set cpu DAI configuration */ + ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS); + if (ret < 0) + return ret; + + return 0; +} + +static struct snd_soc_ops ml7213_ops = { + .hw_params = ml7213_hw_params, +}; + +static struct snd_soc_dai_link ml7213crb_dai = { + .name = "ml26124", + .stream_name = "ML26124", + .cpu_dai_name = "ml7213ioh", + .codec_dai_name = "ml26124-hifi", + .platform_name = "ml7213-i2s-audio", + .codec_name = "ml26124.1-001a", + .ops = &ml7213_ops, +}; + +static struct snd_soc_card ml7213crb_card = { + .name = "LAPIS Semiconductor ML7213CRB", + .dai_link = &ml7213crb_dai, + .num_links = 1, + .dapm_widgets = ml7213_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(ml7213_dapm_widgets), + .dapm_routes = ml7213_routes, + .num_dapm_routes = ARRAY_SIZE(ml7213_routes), +}; + +static int __devinit lapis_ml7213_ml26124_probe(struct platform_device *pdev) +{ + int ret; + + ml7213crb_card.dev = &pdev->dev; + ret = snd_soc_register_card(&ml7213crb_card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card failed %d\n", ret); + return ret; + } + + return 0; +} + +static int __devexit lapis_ml7213_ml26124_remove(struct platform_device *pdev) +{ + snd_soc_unregister_card(&ml7213crb_card); + platform_set_drvdata(pdev, NULL); + return 0; +} + +static struct platform_driver snd_ml7213crb_driver = { + .driver = { + .owner = THIS_MODULE, + .name = "lapis-ml7213ioh-CRB", + }, + .probe = lapis_ml7213_ml26124_probe, + .remove = __devexit_p(lapis_ml7213_ml26124_remove), +}; + +module_platform_driver(snd_ml7213crb_driver); + +MODULE_AUTHOR("Tomoya MORINAGA <tomoya.rohm(a)gmail.com>"); +MODULE_DESCRIPTION("LAPIS Semiconductor ML7213 IOH ALSA SoC machine driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:lapis-ml7213ioh-CRB"); -- 1.7.7.6

2 1

[alsa-devel] [PATCH] ASoC: wm8994: Update WM8994 DCS calibration
by Mark Brown 21 Mar '12

21 Mar '12

Based on latest production information. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8994.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 8efc42b..058f183 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3623,7 +3623,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) case 2: case 3: wm8994->hubs.dcs_codes_l = -9; - wm8994->hubs.dcs_codes_r = -5; + wm8994->hubs.dcs_codes_r = -7; break; default: break; -- 1.7.9.1

1 0

[alsa-devel] [PATCH 0/3] ASoC: omap-mcbsp: Constraint handling changes
by Peter Ujfalusi 21 Mar '12

21 Mar '12

Hello, This series will add the following changes: 1. We do not need to place buffer size constraint in case of a capture stream. 2. Grazvydas Ignotas <notasas(a)gmail.com> reported that on Pandora they have issues with legacy applications (and OSS emulation) when they open the playback with small period size (smaller than the FIFO size). Since these legacy applications can not be fixed (and it is not feasible), this series will provide a solution to overcome with the underruns at the stream start. With the introduction of the new sysfs file (period_protection) the user can request the driver to place the constraint to the period size instead of the buffer size. With the period_protection one can specify the number of samples they want to have as protection in period size constraint over the McBSP FIFO size. As an example: OMAP3, McBSP2, stereo stream. the FIFO is 640 samples long. period_protection = 1 will ensure that the period size is minimum of 641 samples long. With the test code from Grazvydas Ignotas: http://notaz.gp2x.de/misc/alsa_period_test.c I don't see underrun issues with period_protection = 1 on BeagleBoard. Regards, Peter --- Peter Ujfalusi (3): ASoC: omap-mcbsp: buffer size constraint only applies to playback stream ASoC: omap-mcbsp: Restructure omap_mcbsp_dai_startup code ASoC: omap-mcbsp: Add period size protection mode sound/soc/omap/mcbsp.c | 2 + sound/soc/omap/mcbsp.h | 1 + sound/soc/omap/omap-mcbsp.c | 71 ++++++++++++++++++++++++++++++++++-------- 3 files changed, 60 insertions(+), 14 deletions(-) -- 1.7.8.5

5 27

[alsa-devel] Question about sound channel
by Kuninori Morimoto 21 Mar '12

21 Mar '12

Hi ALSA ML I have question about sound channel. If input sound was MONO (= 1ch), but codec supports I2S (= 2ch) only, How to output sound ? What should the driver do in this case ? Best regards --- Kuninori Morimoto

2 2

[alsa-devel] Last minute ASoC updates for 3.4
by Mark Brown 21 Mar '12

21 Mar '12

The following changes since commit 5ec65ee589fdaca7298b6303fd74ad6c121a8f38: ASoC: mx27vis-aic32x4: Convert it to platform driver (2012-03-13 23:09:59 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-3.4 for you to fetch changes up to 22f8d055350066b4a87de4adea8c5213cac54534: ASoC: wm8994: Provide VMID mode control and fix default sequence (2012-03-19 19:08:17 +0000) ---------------------------------------------------------------- Last minute ASoC updates for 3.4 There's a couple of small features here that were added late on but have been in -next in my tree and some bug fixes. The wm_hubs stuff is actually bug fixes - the stuff that's currently in 3.4 is a half way house between the two solutions that the latest change allows the machine to select between. ---------------------------------------------------------------- Daniel Mack (1): ASoC: pxa-ssp: atomically set stream active masks Mark Brown (5): ASoC: wm8996: Add 44.1kHz support ASoC: core: Fix obscure leak of runtime array ASoC: wm_hubs: Don't actively manage LINEOUT_VMID_BUF ASoC: wm8994: Add missing break in resume ASoC: wm8994: Provide VMID mode control and fix default sequence Sangsu Park (1): ASoC: Samsung: Added to support mono recording Timur Tabi (1): ASoC: fsl: p1022ds: tell the WM8776 codec driver that it's the master sound/soc/codecs/wm8994.c | 187 ++++++++++++++++++++++++++++++++++--------- sound/soc/codecs/wm8994.h | 8 ++ sound/soc/codecs/wm8996.c | 19 +++-- sound/soc/codecs/wm_hubs.c | 16 +--- sound/soc/fsl/p1022_ds.c | 24 ++++-- sound/soc/pxa/pxa-ssp.c | 61 +++++++++------ sound/soc/samsung/i2s.c | 13 +++- sound/soc/soc-core.c | 8 +- 8 files changed, 239 insertions(+), 97 deletions(-)

2 1