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 a59692e740b4558468280708228b6165422e7924..f8da6dd115ed1c292d66fe0d7bee395ba849f2f7 100644 (file)
--- a/sound/soc/imx/phycore-ac97.c
+++ b/sound/soc/imx/phycore-ac97.c
@@ -18,7 +18,8 @@
 #include <sound/pcm.h>
 #include <sound/soc.h>
 #include <asm/mach-types.h>
-#include <mach/audmux.h>
+
+#include "imx-audmux.h"
 
 static struct snd_soc_card imx_phycore;
 
@@ -52,27 +53,27 @@ static int __init imx_phycore_init(void)
        int ret;
 
        if (machine_is_pca100()) {
-               mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0,
-                       MXC_AUDMUX_V1_PCR_SYN | /* 4wire mode */
-                       MXC_AUDMUX_V1_PCR_TFCSEL(3) |
-                       MXC_AUDMUX_V1_PCR_TCLKDIR | /* clock is output */
-                       MXC_AUDMUX_V1_PCR_RXDSEL(3));
-               mxc_audmux_v1_configure_port(3,
-                       MXC_AUDMUX_V1_PCR_SYN | /* 4wire mode */
-                       MXC_AUDMUX_V1_PCR_TFCSEL(0) |
-                       MXC_AUDMUX_V1_PCR_TFSDIR |
-                       MXC_AUDMUX_V1_PCR_RXDSEL(0));
+               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()) {
-               mxc_audmux_v2_configure_port(3,
-                       MXC_AUDMUX_V2_PTCR_SYN | /* 4wire mode */
-                       MXC_AUDMUX_V2_PTCR_TFSEL(0) |
-                       MXC_AUDMUX_V2_PTCR_TFSDIR,
-                       MXC_AUDMUX_V2_PDCR_RXDSEL(0));
-               mxc_audmux_v2_configure_port(0,
-                       MXC_AUDMUX_V2_PTCR_SYN | /* 4wire mode */
-                       MXC_AUDMUX_V2_PTCR_TCSEL(3) |
-                       MXC_AUDMUX_V2_PTCR_TCLKDIR, /* clock is output */
-                       MXC_AUDMUX_V2_PDCR_RXDSEL(3));
+               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;