ASoC: imx: move eukrea audmux call into ASoC machine driver

It moves eukrea audmux configuration call from board file into ASoC
machine driver eukrea-tlv320, so that it gets aligned wm1133-ev1 and
mx27vis-aic32x4, and more importantly it will ease the moving of audmux
into sound/soc/imx as a platform driver later.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

3 files changed, 0 insertions, 54 deletions

diff --git a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
index 5db3e1463af7..5f2f91d1798b 100644
--- a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
@@ -32,7 +32,6 @@
 #include <mach/common.h>
 #include <mach/iomux-mx27.h>
 #include <mach/hardware.h>
-#include <mach/audmux.h>
 
 #include "devices-imx27.h"
 
@@ -306,25 +305,6 @@ void __init eukrea_mbimx27_baseboard_init(void)
         mxc_gpio_setup_multiple_pins(eukrea_mbimx27_pins,
                 ARRAY_SIZE(eukrea_mbimx27_pins), "MBIMX27");
 
-#if defined(CONFIG_SND_SOC_EUKREA_TLV320) \
-        || defined(CONFIG_SND_SOC_EUKREA_TLV320_MODULE)
-        /* SSI unit master I2S codec connected to SSI_PINS_4*/
-        mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0,
-                        MXC_AUDMUX_V1_PCR_SYN |
-                        MXC_AUDMUX_V1_PCR_TFSDIR |
-                        MXC_AUDMUX_V1_PCR_TCLKDIR |
-                        MXC_AUDMUX_V1_PCR_RFSDIR |
-                        MXC_AUDMUX_V1_PCR_RCLKDIR |
-                        MXC_AUDMUX_V1_PCR_TFCSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) |
-                        MXC_AUDMUX_V1_PCR_RFCSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) |
-                        MXC_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4)
-        );
-        mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR3_SSI_PINS_4,
-                        MXC_AUDMUX_V1_PCR_SYN |
-                        MXC_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR1_SSI0)
-        );
-#endif
-
         imx27_add_imx_uart1(&uart_pdata);
         imx27_add_imx_uart2(&uart_pdata);
 #if !defined(MACH_EUKREA_CPUIMX27_USEUART4)
diff --git a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
index 66e8726253fa..2cf603e11c4f 100644
--- a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
@@ -31,7 +31,6 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/mx25.h>
-#include <mach/audmux.h>
 
 #include "devices-imx25.h"
 
@@ -241,22 +240,6 @@ void __init eukrea_mbimxsd25_baseboard_init(void)
                         ARRAY_SIZE(eukrea_mbimxsd_pads)))
                 printk(KERN_ERR "error setting mbimxsd pads !\n");
 
-#if defined(CONFIG_SND_SOC_EUKREA_TLV320)
-        /* SSI unit master I2S codec connected to SSI_AUD5*/
-        mxc_audmux_v2_configure_port(0,
-                        MXC_AUDMUX_V2_PTCR_SYN |
-                        MXC_AUDMUX_V2_PTCR_TFSDIR |
-                        MXC_AUDMUX_V2_PTCR_TFSEL(4) |
-                        MXC_AUDMUX_V2_PTCR_TCLKDIR |
-                        MXC_AUDMUX_V2_PTCR_TCSEL(4),
-                        MXC_AUDMUX_V2_PDCR_RXDSEL(4)
-        );
-        mxc_audmux_v2_configure_port(4,
-                        MXC_AUDMUX_V2_PTCR_SYN,
-                        MXC_AUDMUX_V2_PDCR_RXDSEL(0)
-        );
-#endif
-
         imx25_add_imx_uart1(&uart_pdata);
         imx25_add_imx_fb(&eukrea_mximxsd_fb_pdata);
         imx25_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata);
diff --git a/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c
index 0f0af02b3182..fd8bf8a425a7 100644
--- a/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c
@@ -38,7 +38,6 @@
 #include <mach/hardware.h>
 #include <mach/common.h>
 #include <mach/iomux-mx35.h>
-#include <mach/audmux.h>
 
 #include "devices-imx35.h"
 
@@ -252,22 +251,6 @@ void __init eukrea_mbimxsd35_baseboard_init(void)
                         ARRAY_SIZE(eukrea_mbimxsd_pads)))
                 printk(KERN_ERR "error setting mbimxsd pads !\n");
 
-#if defined(CONFIG_SND_SOC_EUKREA_TLV320)
-        /* SSI unit master I2S codec connected to SSI_AUD4 */
-        mxc_audmux_v2_configure_port(0,
-                        MXC_AUDMUX_V2_PTCR_SYN |
-                        MXC_AUDMUX_V2_PTCR_TFSDIR |
-                        MXC_AUDMUX_V2_PTCR_TFSEL(3) |
-                        MXC_AUDMUX_V2_PTCR_TCLKDIR |
-                        MXC_AUDMUX_V2_PTCR_TCSEL(3),
-                        MXC_AUDMUX_V2_PDCR_RXDSEL(3)
-        );
-        mxc_audmux_v2_configure_port(3,
-                        MXC_AUDMUX_V2_PTCR_SYN,
-                        MXC_AUDMUX_V2_PDCR_RXDSEL(0)
-        );
-#endif
-
         imx35_add_imx_uart1(&uart_pdata);
         imx35_add_ipu_core(&mx3_ipu_data);
         imx35_add_mx3_sdc_fb(&mx3fb_pdata);