On 11/15/2011 03:13 PM, Mark Brown wrote:
On Mon, Nov 07, 2011 at 11:26:02AM +0100, Daniel Mack wrote:
arch/arm/mach-pxa/raumfeld.c | 119 +++++++++++++++++--- sound/soc/pxa/Kconfig | 2 + sound/soc/pxa/raumfeld.c | 249 +++++++++++++++++++++++++++++++++++++++---
Is there any cross dependency between these bits?
You're right - I assumed there are, but it seems that I was mistaken. I'll split this up and re-submit, so it can go trhough appropriate channels.
I honestly didn't notice the ASoC bit in here...
That's at least parially my fault, as something in my work flow crippled the email addresses in the patch, so git send-email didn't actually put you on Cc:.
index 33ebc46..e6db56a 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig @@ -152,6 +152,8 @@ config SND_SOC_RAUMFELD select SND_PXA_SOC_SSP select SND_SOC_CS4270 select SND_SOC_AK4104
- select SND_SOC_STA32X
- select SND_SOC_WM8782
Is this really a single driver? Looking at the code it looks like there's little if any code sharing between the different machines, it'd help with maintainability to have multiple simple drivers.
Hmm. This new version of Raumfeld's hardware features a new ADC and DAC, and the configuration to use is determined by looking at the system revision. If this would be split into multiple smaller drivers, there would be need for a 'master' to dispatch the possible options. I think I'll do that once the next generation is about to land, and leave it as it is for now. Ok for you?
- /* PXA DMA cannot do zero extend for 24bit samples,
- thus only 16bit (two samples packet into 32bit word)
- or 32bit samples are possible
- */
- snd_pcm_hw_constraint_mask64(substream->runtime,
SNDRV_PCM_HW_PARAM_FORMAT,
SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE |
SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S32_BE);
If the PXA DMA controller can't do 24 bit audio it should be imposing this constraint.
Right. Will fix this in the CPU DAI.
+static void raumfeld_sta32x_shutdown(struct snd_pcm_substream *substream) +{
- struct snd_soc_pcm_runtime *rtd = substream->private_data;
- struct snd_soc_dai *codec_dai = rtd->codec_dai;
- /* set freq to 0 to enable all possible codec sample rates */
- snd_soc_dai_set_sysclk(codec_dai, 0, 0, 0);
+}
Are you sure this does the right thing with simultaneous playback and record?
Yes, this works fine. We use this code since awhile already.
- fmt = SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS;
Set this using dai_fmt in hte machine driver.
Can you elaborate on this one? I couldn't find an example for this, sorry.
Daniel