lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: DaVinci: Fix SFFSDR compilation error.

Browse Source 
Remove dependency on sffsdr_fpga_set_codec_fs() when the
SFFSDR FPGA module is not selected.

Signed-off-by: Hugo Villeneuve <hugo@hugovil.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Hugo Villeneuve
2009-01-15 15:40:35 -05:00
committed by Mark Brown
parent c0106d72b8
commit ac37373b64
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sound/soc/davinci/davinci-sffsdr.c
View File

@@ -25,7 +25,9 @@
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#ifdef CONFIG_SFFSDR_FPGA
#include <asm/plat-sffsdr/sffsdr-fpga.h> #include <asm/plat-sffsdr/sffsdr-fpga.h>
#endif
#include <mach/mcbsp.h> #include <mach/mcbsp.h>
#include <mach/edma.h> #include <mach/edma.h>
@@ -43,6 +45,17 @@ static int sffsdr_hw_params(struct snd_pcm_substream *substream,
int fs; int fs;
int ret = 0; int ret = 0;
/* Fsref can be 32000, 44100 or 48000. */
fs = params_rate(params);
#ifndef CONFIG_SFFSDR_FPGA
/* Without the FPGA module, the Fs is fixed at 44100 Hz */
if (fs != 44100) {
pr_debug("warning: only 44.1 kHz is supported without SFFSDR FPGA module\n");
return -EINVAL;
}
#endif
/* Set cpu DAI configuration: /* Set cpu DAI configuration:
* CLKX and CLKR are the inputs for the Sample Rate Generator. * CLKX and CLKR are the inputs for the Sample Rate Generator.
* FSX and FSR are outputs, driven by the sample Rate Generator. */ * FSX and FSR are outputs, driven by the sample Rate Generator. */
@@ -53,12 +66,13 @@ static int sffsdr_hw_params(struct snd_pcm_substream *substream,
if (ret < 0) if (ret < 0)
return ret; return ret;
/* Fsref can be 32000, 44100 or 48000. */
fs = params_rate(params);
pr_debug("sffsdr_hw_params: rate = %d Hz\n", fs); pr_debug("sffsdr_hw_params: rate = %d Hz\n", fs);
#ifndef CONFIG_SFFSDR_FPGA
return 0;
#else
return sffsdr_fpga_set_codec_fs(fs); return sffsdr_fpga_set_codec_fs(fs);
#endif
} }
static struct snd_soc_ops sffsdr_ops = { static struct snd_soc_ops sffsdr_ops = {