diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-03-05 09:30:49 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-05 19:02:36 -0500 |
commit | 60282ede6b73d6ac7b571df5c65fa6a77db1a4a2 (patch) | |
tree | 46b76bb42a1345d55e65e58438054524ce8844c6 /arch/arm | |
parent | f13ebada17142438ab97afa0421aa5084ce174f2 (diff) |
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>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 20 | ||||
-rw-r--r-- | arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 17 | ||||
-rw-r--r-- | arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 17 |
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 @@ | |||
32 | #include <mach/common.h> | 32 | #include <mach/common.h> |
33 | #include <mach/iomux-mx27.h> | 33 | #include <mach/iomux-mx27.h> |
34 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
35 | #include <mach/audmux.h> | ||
36 | 35 | ||
37 | #include "devices-imx27.h" | 36 | #include "devices-imx27.h" |
38 | 37 | ||
@@ -306,25 +305,6 @@ void __init eukrea_mbimx27_baseboard_init(void) | |||
306 | mxc_gpio_setup_multiple_pins(eukrea_mbimx27_pins, | 305 | mxc_gpio_setup_multiple_pins(eukrea_mbimx27_pins, |
307 | ARRAY_SIZE(eukrea_mbimx27_pins), "MBIMX27"); | 306 | ARRAY_SIZE(eukrea_mbimx27_pins), "MBIMX27"); |
308 | 307 | ||
309 | #if defined(CONFIG_SND_SOC_EUKREA_TLV320) \ | ||
310 | || defined(CONFIG_SND_SOC_EUKREA_TLV320_MODULE) | ||
311 | /* SSI unit master I2S codec connected to SSI_PINS_4*/ | ||
312 | mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0, | ||
313 | MXC_AUDMUX_V1_PCR_SYN | | ||
314 | MXC_AUDMUX_V1_PCR_TFSDIR | | ||
315 | MXC_AUDMUX_V1_PCR_TCLKDIR | | ||
316 | MXC_AUDMUX_V1_PCR_RFSDIR | | ||
317 | MXC_AUDMUX_V1_PCR_RCLKDIR | | ||
318 | MXC_AUDMUX_V1_PCR_TFCSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) | | ||
319 | MXC_AUDMUX_V1_PCR_RFCSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) | | ||
320 | MXC_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) | ||
321 | ); | ||
322 | mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR3_SSI_PINS_4, | ||
323 | MXC_AUDMUX_V1_PCR_SYN | | ||
324 | MXC_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR1_SSI0) | ||
325 | ); | ||
326 | #endif | ||
327 | |||
328 | imx27_add_imx_uart1(&uart_pdata); | 308 | imx27_add_imx_uart1(&uart_pdata); |
329 | imx27_add_imx_uart2(&uart_pdata); | 309 | imx27_add_imx_uart2(&uart_pdata); |
330 | #if !defined(MACH_EUKREA_CPUIMX27_USEUART4) | 310 | #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 @@ | |||
31 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
32 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
33 | #include <mach/mx25.h> | 33 | #include <mach/mx25.h> |
34 | #include <mach/audmux.h> | ||
35 | 34 | ||
36 | #include "devices-imx25.h" | 35 | #include "devices-imx25.h" |
37 | 36 | ||
@@ -241,22 +240,6 @@ void __init eukrea_mbimxsd25_baseboard_init(void) | |||
241 | ARRAY_SIZE(eukrea_mbimxsd_pads))) | 240 | ARRAY_SIZE(eukrea_mbimxsd_pads))) |
242 | printk(KERN_ERR "error setting mbimxsd pads !\n"); | 241 | printk(KERN_ERR "error setting mbimxsd pads !\n"); |
243 | 242 | ||
244 | #if defined(CONFIG_SND_SOC_EUKREA_TLV320) | ||
245 | /* SSI unit master I2S codec connected to SSI_AUD5*/ | ||
246 | mxc_audmux_v2_configure_port(0, | ||
247 | MXC_AUDMUX_V2_PTCR_SYN | | ||
248 | MXC_AUDMUX_V2_PTCR_TFSDIR | | ||
249 | MXC_AUDMUX_V2_PTCR_TFSEL(4) | | ||
250 | MXC_AUDMUX_V2_PTCR_TCLKDIR | | ||
251 | MXC_AUDMUX_V2_PTCR_TCSEL(4), | ||
252 | MXC_AUDMUX_V2_PDCR_RXDSEL(4) | ||
253 | ); | ||
254 | mxc_audmux_v2_configure_port(4, | ||
255 | MXC_AUDMUX_V2_PTCR_SYN, | ||
256 | MXC_AUDMUX_V2_PDCR_RXDSEL(0) | ||
257 | ); | ||
258 | #endif | ||
259 | |||
260 | imx25_add_imx_uart1(&uart_pdata); | 243 | imx25_add_imx_uart1(&uart_pdata); |
261 | imx25_add_imx_fb(&eukrea_mximxsd_fb_pdata); | 244 | imx25_add_imx_fb(&eukrea_mximxsd_fb_pdata); |
262 | imx25_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata); | 245 | 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 @@ | |||
38 | #include <mach/hardware.h> | 38 | #include <mach/hardware.h> |
39 | #include <mach/common.h> | 39 | #include <mach/common.h> |
40 | #include <mach/iomux-mx35.h> | 40 | #include <mach/iomux-mx35.h> |
41 | #include <mach/audmux.h> | ||
42 | 41 | ||
43 | #include "devices-imx35.h" | 42 | #include "devices-imx35.h" |
44 | 43 | ||
@@ -252,22 +251,6 @@ void __init eukrea_mbimxsd35_baseboard_init(void) | |||
252 | ARRAY_SIZE(eukrea_mbimxsd_pads))) | 251 | ARRAY_SIZE(eukrea_mbimxsd_pads))) |
253 | printk(KERN_ERR "error setting mbimxsd pads !\n"); | 252 | printk(KERN_ERR "error setting mbimxsd pads !\n"); |
254 | 253 | ||
255 | #if defined(CONFIG_SND_SOC_EUKREA_TLV320) | ||
256 | /* SSI unit master I2S codec connected to SSI_AUD4 */ | ||
257 | mxc_audmux_v2_configure_port(0, | ||
258 | MXC_AUDMUX_V2_PTCR_SYN | | ||
259 | MXC_AUDMUX_V2_PTCR_TFSDIR | | ||
260 | MXC_AUDMUX_V2_PTCR_TFSEL(3) | | ||
261 | MXC_AUDMUX_V2_PTCR_TCLKDIR | | ||
262 | MXC_AUDMUX_V2_PTCR_TCSEL(3), | ||
263 | MXC_AUDMUX_V2_PDCR_RXDSEL(3) | ||
264 | ); | ||
265 | mxc_audmux_v2_configure_port(3, | ||
266 | MXC_AUDMUX_V2_PTCR_SYN, | ||
267 | MXC_AUDMUX_V2_PDCR_RXDSEL(0) | ||
268 | ); | ||
269 | #endif | ||
270 | |||
271 | imx35_add_imx_uart1(&uart_pdata); | 254 | imx35_add_imx_uart1(&uart_pdata); |
272 | imx35_add_ipu_core(&mx3_ipu_data); | 255 | imx35_add_ipu_core(&mx3_ipu_data); |
273 | imx35_add_mx3_sdc_fb(&mx3fb_pdata); | 256 | imx35_add_mx3_sdc_fb(&mx3fb_pdata); |