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 <[email protected]>
---
Untested.
sound/soc/ux500/ux500_msp_dai.h | 5 -----
1 file changed, 5 deletions(-)
diff --git a/sound/soc/ux500/ux500_msp_dai.h b/sound/soc/ux500/ux500_msp_dai.h
index 9c778d9..f531043 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
--
1.7.11.7
On Fri, Mar 29, 2013 at 01:28:21PM +0100, Paul Bolle wrote:
> 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.
Applied, thanks.