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

[alsa-devel] [PATCH 34/36] sound/soc/blackfin: Remove unnecessary casts of private_data
by Joe Perches 13 Jul '10

13 Jul '10

Signed-off-by: Joe Perches <joe(a)perches.com> --- sound/soc/blackfin/bf5xx-ac97.c | 6 ++---- sound/soc/blackfin/bf5xx-tdm.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c index 523b7fc..c0eba51 100644 --- a/sound/soc/blackfin/bf5xx-ac97.c +++ b/sound/soc/blackfin/bf5xx-ac97.c @@ -255,8 +255,7 @@ EXPORT_SYMBOL_GPL(soc_ac97_ops); #ifdef CONFIG_PM static int bf5xx_ac97_suspend(struct snd_soc_dai *dai) { - struct sport_device *sport = - (struct sport_device *)dai->private_data; + struct sport_device *sport = dai->private_data; pr_debug("%s : sport %d\n", __func__, dai->id); if (!dai->active) @@ -271,8 +270,7 @@ static int bf5xx_ac97_suspend(struct snd_soc_dai *dai) static int bf5xx_ac97_resume(struct snd_soc_dai *dai) { int ret; - struct sport_device *sport = - (struct sport_device *)dai->private_data; + struct sport_device *sport = dai->private_data; pr_debug("%s : sport %d\n", __func__, dai->id); if (!dai->active) diff --git a/sound/soc/blackfin/bf5xx-tdm.c b/sound/soc/blackfin/bf5xx-tdm.c index 4b36012..24c1426 100644 --- a/sound/soc/blackfin/bf5xx-tdm.c +++ b/sound/soc/blackfin/bf5xx-tdm.c @@ -210,8 +210,7 @@ static int bf5xx_tdm_set_channel_map(struct snd_soc_dai *dai, #ifdef CONFIG_PM static int bf5xx_tdm_suspend(struct snd_soc_dai *dai) { - struct sport_device *sport = - (struct sport_device *)dai->private_data; + struct sport_device *sport = dai->private_data; if (!dai->active) return 0; @@ -225,8 +224,7 @@ static int bf5xx_tdm_suspend(struct snd_soc_dai *dai) static int bf5xx_tdm_resume(struct snd_soc_dai *dai) { int ret; - struct sport_device *sport = - (struct sport_device *)dai->private_data; + struct sport_device *sport = dai->private_data; if (!dai->active) return 0; -- 1.7.1.337.g6068.dirty

3 2

[alsa-devel] [patch 0/2] Kirkwood audio fixes
by arnaud.patard＠rtp-net.org 13 Jul '10

13 Jul '10

Hi, While working on the t5325 audio support, I found two small buglets in the kirkwood ASoC support. The first one is aiming at fixing mono audio playback and should fix mono playback for all platforms. The second is adding support for muting/unmuting kirkwood audio. It's mainly usefull for the t5325 which has a bootloader playing with this (hardware default is not muted). Arnaud

3 5

[alsa-devel] [PATCH 1/6 v3] ASoC: fsi: modify format area definition on flags
by Kuninori Morimoto 13 Jul '10

13 Jul '10

There is no necessity that each bit in this area has the meaning. This patch modify it to sequence number Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- v2 -> v3 o don't use << 0 shift 2/6 - 6/6 doesn't depend on 1/6 patch include/sound/sh_fsi.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h index c022736..3ecdb96 100644 --- a/include/sound/sh_fsi.h +++ b/include/sound/sh_fsi.h @@ -55,12 +55,12 @@ #define SH_FSI_GET_IFMT(x) ((x >> 8) & SH_FSI_FMT_MASK) #define SH_FSI_GET_OFMT(x) ((x >> 0) & SH_FSI_FMT_MASK) -#define SH_FSI_FMT_MONO (1 << 0) -#define SH_FSI_FMT_MONO_DELAY (1 << 1) -#define SH_FSI_FMT_PCM (1 << 2) -#define SH_FSI_FMT_I2S (1 << 3) -#define SH_FSI_FMT_TDM (1 << 4) -#define SH_FSI_FMT_TDM_DELAY (1 << 5) +#define SH_FSI_FMT_MONO 0 +#define SH_FSI_FMT_MONO_DELAY 1 +#define SH_FSI_FMT_PCM 2 +#define SH_FSI_FMT_I2S 3 +#define SH_FSI_FMT_TDM 4 +#define SH_FSI_FMT_TDM_DELAY 5 #define SH_FSI_IFMT_TDM_CH(x) \ (SH_FSI_IFMT(TDM) | SH_FSI_SET_CH_I(x)) -- 1.7.0.4

3 2

[alsa-devel] [PATCH 0/2] ASoC: fsi: fixup patches
by Kuninori Morimoto 13 Jul '10

13 Jul '10

Dear Mark These are v2 bug fix patches for FSI driver. Kuninori Morimoto (2): ASoC: fsi: fixup clock inversion operation ASoC: fsi: fixup wrong value setting order of TDM v1 -> v2 It is bug fix only Best regards -- Kuninori Morimoto

3 4

[alsa-devel] [PATCH 1/4] ASoC: DaVinci: remove requirement that dma_params is 1st in structure
by Troy Kisky 13 Jul '10

13 Jul '10

Remove requirement that dma_params is 1st in the structures davinci_audio_dev and davinci_mcbsp_dev. Signed-off-by: Troy Kisky <troy.kisky(a)boundarydevices.com> --- sound/soc/davinci/davinci-i2s.c | 6 +----- sound/soc/davinci/davinci-mcasp.c | 1 + sound/soc/davinci/davinci-mcasp.h | 5 ----- sound/soc/davinci/davinci-pcm.c | 7 ++++--- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c index 4ae7070..9e69a4e 100644 --- a/sound/soc/davinci/davinci-i2s.c +++ b/sound/soc/davinci/davinci-i2s.c @@ -98,11 +98,6 @@ enum { }; struct davinci_mcbsp_dev { - /* - * dma_params must be first because rtd->dai->cpu_dai->private_data - * is cast to a pointer of an array of struct davinci_pcm_dma_params in - * davinci_pcm_open. - */ struct davinci_pcm_dma_params dma_params[2]; void __iomem *base; #define MOD_DSP_A 0 @@ -547,6 +542,7 @@ static int davinci_i2s_probe(struct platform_device *pdev) dev->dma_params[SNDRV_PCM_STREAM_CAPTURE].channel = res->start; davinci_i2s_dai.private_data = dev; + davinci_i2s_dai.dma_data = dev->dma_params; ret = snd_soc_register_dai(&davinci_i2s_dai); if (ret != 0) goto err_free_mem; diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 5d1f98a..5023915 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -907,6 +907,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev) dma_data->channel = res->start; davinci_mcasp_dai[pdata->op_mode].private_data = dev; + davinci_mcasp_dai[pdata->op_mode].dma_data = dev->dma_params; davinci_mcasp_dai[pdata->op_mode].dev = &pdev->dev; ret = snd_soc_register_dai(&davinci_mcasp_dai[pdata->op_mode]); diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h index 9d179cc..582c924 100644 --- a/sound/soc/davinci/davinci-mcasp.h +++ b/sound/soc/davinci/davinci-mcasp.h @@ -39,11 +39,6 @@ enum { }; struct davinci_audio_dev { - /* - * dma_params must be first because rtd->dai->cpu_dai->private_data - * is cast to a pointer of an array of struct davinci_pcm_dma_params in - * davinci_pcm_open. - */ struct davinci_pcm_dma_params dma_params[2]; void __iomem *base; int sample_rate; diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c index c73a915..c2c2e85 100644 --- a/sound/soc/davinci/davinci-pcm.c +++ b/sound/soc/davinci/davinci-pcm.c @@ -238,10 +238,11 @@ static int davinci_pcm_open(struct snd_pcm_substream *substream) struct davinci_runtime_data *prtd; int ret = 0; struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct davinci_pcm_dma_params *pa = rtd->dai->cpu_dai->private_data; - struct davinci_pcm_dma_params *params = &pa[substream->stream]; - if (!params) + struct davinci_pcm_dma_params *pa = rtd->dai->cpu_dai->dma_data; + struct davinci_pcm_dma_params *params; + if (!pa) return -ENODEV; + params = &pa[substream->stream]; snd_soc_set_runtime_hwparams(substream, &davinci_pcm_hardware); /* ensure that buffer size is a multiple of period size */ -- 1.5.6.3

3 5

[alsa-devel] [PATCH] ASoC: TWL4030: Fix for digital loopback gain range
by Peter Ujfalusi 13 Jul '10

13 Jul '10

When the gain is configured using dB value it was not possible to use -24dB since the loopback got muted instead of -24dB. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)nokia.com> --- sound/soc/codecs/twl4030.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 8d36bfa..d7f0048 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -540,10 +540,11 @@ static const struct snd_kcontrol_new twl4030_dapm_abypassl2_control = static const struct snd_kcontrol_new twl4030_dapm_abypassv_control = SOC_DAPM_SINGLE("Switch", TWL4030_REG_VDL_APGA_CTL, 2, 1, 0); -/* Digital bypass gain, 0 mutes the bypass */ +/* Digital bypass gain, mute instead of -30dB */ static const unsigned int twl4030_dapm_dbypass_tlv[] = { - TLV_DB_RANGE_HEAD(2), - 0, 3, TLV_DB_SCALE_ITEM(-2400, 0, 1), + TLV_DB_RANGE_HEAD(3), + 0, 1, TLV_DB_SCALE_ITEM(-3000, 600, 1), + 2, 3, TLV_DB_SCALE_ITEM(-2400, 0, 0), 4, 7, TLV_DB_SCALE_ITEM(-1800, 600, 0), }; -- 1.7.1

3 2

[alsa-devel] [PATCH] ASoC: TWL4030: DAC power optimization
by Peter Ujfalusi 13 Jul '10

13 Jul '10

Restructure the DAPM connections in order to enable only the needed DAC (out of four in twl4030 series). I need to keep the 'AIF Enable' supply connected to the L2/R2 digital path, since the digital loopback needs AIF and APLL running. If no valid route available, than none of the DAC will be powered, but the AIF and APLL is going to be enabled. Furthermore, if only one audio path have valid route, than only the corresponding DAC will be powered. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)nokia.com> --- sound/soc/codecs/twl4030.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index d7f0048..6fd6d0b 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -1460,8 +1460,11 @@ static const struct snd_soc_dapm_route intercon[] = { /* Supply for the digital part (APLL) */ {"Digital Voice Playback Mixer", NULL, "APLL Enable"}, - {"Digital R1 Playback Mixer", NULL, "AIF Enable"}, - {"Digital L1 Playback Mixer", NULL, "AIF Enable"}, + {"DAC Left1", NULL, "AIF Enable"}, + {"DAC Right1", NULL, "AIF Enable"}, + {"DAC Left2", NULL, "AIF Enable"}, + {"DAC Right1", NULL, "AIF Enable"}, + {"Digital R2 Playback Mixer", NULL, "AIF Enable"}, {"Digital L2 Playback Mixer", NULL, "AIF Enable"}, @@ -1532,10 +1535,10 @@ static const struct snd_soc_dapm_route intercon[] = { /* outputs */ /* Must be always connected (for AIF and APLL) */ - {"Virtual HiFi OUT", NULL, "Digital L1 Playback Mixer"}, - {"Virtual HiFi OUT", NULL, "Digital R1 Playback Mixer"}, - {"Virtual HiFi OUT", NULL, "Digital L2 Playback Mixer"}, - {"Virtual HiFi OUT", NULL, "Digital R2 Playback Mixer"}, + {"Virtual HiFi OUT", NULL, "DAC Left1"}, + {"Virtual HiFi OUT", NULL, "DAC Right1"}, + {"Virtual HiFi OUT", NULL, "DAC Left2"}, + {"Virtual HiFi OUT", NULL, "DAC Right2"}, /* Must be always connected (for APLL) */ {"Virtual Voice OUT", NULL, "Digital Voice Playback Mixer"}, /* Physical outputs */ -- 1.7.1.1

3 2

[alsa-devel] [PATCH 0/8] ASoC: fsi: fixup patches
by Kuninori Morimoto 13 Jul '10

13 Jul '10

Dear Mark These patches are fixup for FSI driver Kuninori Morimoto (8): ASoC: fsi: modify format area definition on flags ASoC: fsi: fixup clock inversion operation ASoC: fsi: remove un-used variable on fsi_dai_startup ASoC: fsi: remove noisy CR_FMT macro ASoC: fsi: modify wrong value setting order of TDM ASoC: fsi: Change struct fsi_regs to fsi_core ASoC: fsi: Add pr_err for noticing unsupported access ASoC: fsi: Fixup for master mode Some of these are not so important for now. But it is used from "FSI - HDMI" patches which I will send in future

2 13

[alsa-devel] issue with TWL4030
by Grazvydas Ignotas 13 Jul '10

13 Jul '10

Hi, there seems to be a problem with TWL4030 hw_param programming, which is easy to reproduce over OSS emulation with this simple program: int oss_dev = open("/dev/dsp", O_WRONLY); int stereo = 1, bits = 16, rate = 44100; ioctl(oss_dev, SNDCTL_DSP_SETFMT, &bits); ioctl(oss_dev, SNDCTL_DSP_SPEED, &rate); ioctl(oss_dev, SNDCTL_DSP_STEREO, &stereo); write(oss_dev, somebuff, sizeof(somebuff)); The above program ends up playing at 8kHz, instead of expected 44kHz. I did some call tracing and got this: [ 1092.246032] soc_pcm_hw_params, rate 8000 [ 1092.250122] twl4030_hw_params [ 1092.253234] set rate 8000 [ 1092.256103] configured 1 [ 1092.259368] soc_pcm_hw_params, rate 8000 [ 1092.263427] twl4030_hw_params [ 1092.266845] soc_pcm_hw_params, rate 44100 [ 1092.270965] twl4030_hw_params [ 1094.459106] twl4030_shutdown [ 1094.462036] configured 0 So it looks like twl4030->configured is the culprit of this, removing it solves the problem, but I guess that will break something else. Any ideas how to properly fix this? Gražvydas

6 11

[alsa-devel] [PATCH 0/6] ASoC: fsi: modify patch
by Kuninori Morimoto 13 Jul '10

13 Jul '10

Dear Mark These are v2 patches for FSI driver almost all are same as v1 Kuninori Morimoto (6): ASoC: fsi: modify format area definition on flags ASoC: fsi: remove un-used variable on fsi_dai_startup ASoC: fsi: remove noisy CR_FMT macro ASoC: fsi: Change struct fsi_regs to fsi_core ASoC: fsi: Add pr_err for noticing unsupported access ASoC: fsi: Fixup for master mode v1 -> v2 o modiry straight start number as 0 o based on bug fix patches Best regards -- Kuninori Morimoto

1 6