summaryrefslogtreecommitdiffstats
path: root/sound/soc/ux500
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 13:57:22 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 13:57:22 +0100
commit0dd9e6bd6f878070ac64b331c8d287460a697374 (patch)
tree3cf31d01d0fade8232c0b19da30c82ade19c267a /sound/soc/ux500
parentd14bc151a4f66871fd02fd9b28d8464859ca3ae2 (diff)
parent4f88eff834361d20f507757dde7e636fe2ca0a04 (diff)
downloadlinux-0dd9e6bd6f878070ac64b331c8d287460a697374.tar.bz2
Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next
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