diff options
author | Sanjeev Premi <premi@ti.com> | 2011-05-11 09:55:35 -0400 |
---|---|---|
committer | Liam Girdwood <lrg@ti.com> | 2011-05-13 07:00:15 -0400 |
commit | d491297752c3a36f6cfabd4cd578c0cfa2098044 (patch) | |
tree | c96f179d7b010ba01da5e46b9e6d8a5906bca7fb /sound/soc/omap | |
parent | b417382419c67fda6463e02eafb8efebd5f8759e (diff) |
ASoC: omap-mcbsp: Remove restrictive checks for cpu type
Current checks for cpu type were too restrictive leading
to failures for other silicons in same family.
The problem was found while testing audio playback on
AM37x and AM35x processors. But should exist on OMAP36xx
as well.
Signed-off-by: Sanjeev Premi <premi@ti.com>
cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
cc: Liam Girdwood <lrg@ti.com>
cc: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/omap')
-rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index afbc7be803dd..07b772357244 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c | |||
@@ -146,7 +146,7 @@ static int omap_mcbsp_dai_startup(struct snd_pcm_substream *substream, | |||
146 | * 2 channels (stereo): size is 128 / 2 = 64 frames (2 * 64 words) | 146 | * 2 channels (stereo): size is 128 / 2 = 64 frames (2 * 64 words) |
147 | * 4 channels: size is 128 / 4 = 32 frames (4 * 32 words) | 147 | * 4 channels: size is 128 / 4 = 32 frames (4 * 32 words) |
148 | */ | 148 | */ |
149 | if (cpu_is_omap343x() || cpu_is_omap44xx()) { | 149 | if (cpu_is_omap34xx() || cpu_is_omap44xx()) { |
150 | /* | 150 | /* |
151 | * Rule for the buffer size. We should not allow | 151 | * Rule for the buffer size. We should not allow |
152 | * smaller buffer than the FIFO size to avoid underruns | 152 | * smaller buffer than the FIFO size to avoid underruns |
@@ -258,7 +258,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, | |||
258 | default: | 258 | default: |
259 | return -EINVAL; | 259 | return -EINVAL; |
260 | } | 260 | } |
261 | if (cpu_is_omap343x()) { | 261 | if (cpu_is_omap34xx()) { |
262 | dma_data->set_threshold = omap_mcbsp_set_threshold; | 262 | dma_data->set_threshold = omap_mcbsp_set_threshold; |
263 | /* TODO: Currently, MODE_ELEMENT == MODE_FRAME */ | 263 | /* TODO: Currently, MODE_ELEMENT == MODE_FRAME */ |
264 | if (omap_mcbsp_get_dma_op_mode(bus_id) == | 264 | if (omap_mcbsp_get_dma_op_mode(bus_id) == |