diff options
Diffstat (limited to 'sound/soc/imx/phycore-ac97.c')
-rw-r--r-- | sound/soc/imx/phycore-ac97.c | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/sound/soc/imx/phycore-ac97.c b/sound/soc/imx/phycore-ac97.c index 6ac12111de6a..f8da6dd115ed 100644 --- a/sound/soc/imx/phycore-ac97.c +++ b/sound/soc/imx/phycore-ac97.c | |||
@@ -19,6 +19,8 @@ | |||
19 | #include <sound/soc.h> | 19 | #include <sound/soc.h> |
20 | #include <asm/mach-types.h> | 20 | #include <asm/mach-types.h> |
21 | 21 | ||
22 | #include "imx-audmux.h" | ||
23 | |||
22 | static struct snd_soc_card imx_phycore; | 24 | static struct snd_soc_card imx_phycore; |
23 | 25 | ||
24 | static struct snd_soc_ops imx_phycore_hifi_ops = { | 26 | static struct snd_soc_ops imx_phycore_hifi_ops = { |
@@ -50,9 +52,32 @@ static int __init imx_phycore_init(void) | |||
50 | { | 52 | { |
51 | int ret; | 53 | int ret; |
52 | 54 | ||
53 | if (!machine_is_pcm043() && !machine_is_pca100()) | 55 | if (machine_is_pca100()) { |
56 | imx_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0, | ||
57 | IMX_AUDMUX_V1_PCR_SYN | /* 4wire mode */ | ||
58 | IMX_AUDMUX_V1_PCR_TFCSEL(3) | | ||
59 | IMX_AUDMUX_V1_PCR_TCLKDIR | /* clock is output */ | ||
60 | IMX_AUDMUX_V1_PCR_RXDSEL(3)); | ||
61 | imx_audmux_v1_configure_port(3, | ||
62 | IMX_AUDMUX_V1_PCR_SYN | /* 4wire mode */ | ||
63 | IMX_AUDMUX_V1_PCR_TFCSEL(0) | | ||
64 | IMX_AUDMUX_V1_PCR_TFSDIR | | ||
65 | IMX_AUDMUX_V1_PCR_RXDSEL(0)); | ||
66 | } else if (machine_is_pcm043()) { | ||
67 | imx_audmux_v2_configure_port(3, | ||
68 | IMX_AUDMUX_V2_PTCR_SYN | /* 4wire mode */ | ||
69 | IMX_AUDMUX_V2_PTCR_TFSEL(0) | | ||
70 | IMX_AUDMUX_V2_PTCR_TFSDIR, | ||
71 | IMX_AUDMUX_V2_PDCR_RXDSEL(0)); | ||
72 | imx_audmux_v2_configure_port(0, | ||
73 | IMX_AUDMUX_V2_PTCR_SYN | /* 4wire mode */ | ||
74 | IMX_AUDMUX_V2_PTCR_TCSEL(3) | | ||
75 | IMX_AUDMUX_V2_PTCR_TCLKDIR, /* clock is output */ | ||
76 | IMX_AUDMUX_V2_PDCR_RXDSEL(3)); | ||
77 | } else { | ||
54 | /* return happy. We might run on a totally different machine */ | 78 | /* return happy. We might run on a totally different machine */ |
55 | return 0; | 79 | return 0; |
80 | } | ||
56 | 81 | ||
57 | imx_phycore_snd_ac97_device = platform_device_alloc("soc-audio", -1); | 82 | imx_phycore_snd_ac97_device = platform_device_alloc("soc-audio", -1); |
58 | if (!imx_phycore_snd_ac97_device) | 83 | if (!imx_phycore_snd_ac97_device) |