summaryrefslogtreecommitdiffstats
path: root/sound/soc/ux500
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2013-03-29 13:28:21 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-08 13:44:32 +0100
commit4f88eff834361d20f507757dde7e636fe2ca0a04 (patch)
tree2397a173ecc9958264df5262855dabd30cbe649a /sound/soc/ux500
parent31880c37c11e28cb81c70757e38392b42e695dc6 (diff)
downloadlinux-4f88eff834361d20f507757dde7e636fe2ca0a04.tar.gz
linux-4f88eff834361d20f507757dde7e636fe2ca0a04.tar.bz2
linux-4f88eff834361d20f507757dde7e636fe2ca0a04.zip
ASoC: Ux500: remove test for undefined Kconfig macro
A test for CONFIG_SND_SOC_UX500_AB5500 was added in v3.5. But there never was a corresponding Kconfig symbol so this test has always evaluated to true. And since AB5500 support was removed in v3.5 it appears safe to remove this test and a few lines of code. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/ux500')
-rw-r--r--sound/soc/ux500/ux500_msp_dai.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/ux500/ux500_msp_dai.h b/sound/soc/ux500/ux500_msp_dai.h
index 9c778d9c3838..f53104359f15 100644
--- a/sound/soc/ux500/ux500_msp_dai.h
+++ b/sound/soc/ux500/ux500_msp_dai.h
@@ -35,13 +35,8 @@
#define FRAME_PER_8_SLOTS 138
#define FRAME_PER_16_SLOTS 277
-#ifndef CONFIG_SND_SOC_UX500_AB5500
#define UX500_MSP_INTERNAL_CLOCK_FREQ 40000000
#define UX500_MSP1_INTERNAL_CLOCK_FREQ UX500_MSP_INTERNAL_CLOCK_FREQ
-#else
-#define UX500_MSP_INTERNAL_CLOCK_FREQ 13000000
-#define UX500_MSP1_INTERNAL_CLOCK_FREQ (UX500_MSP_INTERNAL_CLOCK_FREQ * 2)
-#endif
#define UX500_MSP_MIN_CHANNELS 1
#define UX500_MSP_MAX_CHANNELS 8