ASoC: Add missing regmap_init_i2c in wm8804_i2c_probe

[mirror_ubuntu-artful-kernel.git] / sound / soc / imx / phycore-ac97.c

diff --git a/sound/soc/imx/phycore-ac97.c b/sound/soc/imx/phycore-ac97.c
index a7deb5cb2433d575997e61624efa01be616cd2fa..f8da6dd115ed1c292d66fe0d7bee395ba849f2f7 100644 (file)
--- a/sound/soc/imx/phycore-ac97.c
+++ b/sound/soc/imx/phycore-ac97.c
@@ -19,6 +19,8 @@
 #include <sound/soc.h>
 #include <asm/mach-types.h>
 
+#include "imx-audmux.h"
+
 static struct snd_soc_card imx_phycore;
 
 static struct snd_soc_ops imx_phycore_hifi_ops = {
@@ -38,6 +40,7 @@ static struct snd_soc_dai_link imx_phycore_dai_ac97[] = {
 
 static struct snd_soc_card imx_phycore = {
        .name           = "PhyCORE-ac97-audio",
+       .owner          = THIS_MODULE,
        .dai_link       = imx_phycore_dai_ac97,
        .num_links      = ARRAY_SIZE(imx_phycore_dai_ac97),
 };
@@ -49,9 +52,32 @@ static int __init imx_phycore_init(void)
 {
        int ret;
 
-       if (!machine_is_pcm043() && !machine_is_pca100())
+       if (machine_is_pca100()) {
+               imx_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0,
+                       IMX_AUDMUX_V1_PCR_SYN | /* 4wire mode */
+                       IMX_AUDMUX_V1_PCR_TFCSEL(3) |
+                       IMX_AUDMUX_V1_PCR_TCLKDIR | /* clock is output */
+                       IMX_AUDMUX_V1_PCR_RXDSEL(3));
+               imx_audmux_v1_configure_port(3,
+                       IMX_AUDMUX_V1_PCR_SYN | /* 4wire mode */
+                       IMX_AUDMUX_V1_PCR_TFCSEL(0) |
+                       IMX_AUDMUX_V1_PCR_TFSDIR |
+                       IMX_AUDMUX_V1_PCR_RXDSEL(0));
+       } else if (machine_is_pcm043()) {
+               imx_audmux_v2_configure_port(3,
+                       IMX_AUDMUX_V2_PTCR_SYN | /* 4wire mode */
+                       IMX_AUDMUX_V2_PTCR_TFSEL(0) |
+                       IMX_AUDMUX_V2_PTCR_TFSDIR,
+                       IMX_AUDMUX_V2_PDCR_RXDSEL(0));
+               imx_audmux_v2_configure_port(0,
+                       IMX_AUDMUX_V2_PTCR_SYN | /* 4wire mode */
+                       IMX_AUDMUX_V2_PTCR_TCSEL(3) |
+                       IMX_AUDMUX_V2_PTCR_TCLKDIR, /* clock is output */
+                       IMX_AUDMUX_V2_PDCR_RXDSEL(3));
+       } else {
                /* return happy. We might run on a totally different machine */
                return 0;
+       }
 
        imx_phycore_snd_ac97_device = platform_device_alloc("soc-audio", -1);
        if (!imx_phycore_snd_ac97_device)