Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next

0dd9e6bd · Mark Brown · d14bc151 · 4f88eff8 · 0dd9e6bd
Commit 0dd9e6bd authored Apr 12, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

sound/soc/ux500/ux500_msp_dai.h sound/soc/ux500/ux500_msp_dai.h +0 -5

No files found.
--- 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