From: Philippe Rétornaz <philippe.retornaz@epfl.ch>
Date: Tue, 1 Oct 2013 12:36:11 +0000 (+0200)
Subject: ASoC: fsl: Fix sound on mx31moboard
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1d73ad298d1bfeee5d77c19e5cd667c551e30632;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

ASoC: fsl: Fix sound on mx31moboard

Commit 42810d (ASoC: imx-mc13783: Add audmux settings for mx27pdk) broke
the sound on mx31moboard. Restore back the audmux setting on such boards.

Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch>
Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/sound/soc/fsl/imx-mc13783.c b/sound/soc/fsl/imx-mc13783.c
index a3d60d4bea4c..a2fd7321b5a9 100644
--- a/sound/soc/fsl/imx-mc13783.c
+++ b/sound/soc/fsl/imx-mc13783.c
@@ -112,7 +112,7 @@ static int imx_mc13783_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	if (machine_is_mx31_3ds()) {
+	if (machine_is_mx31_3ds() || machine_is_mx31moboard()) {
 		imx_audmux_v2_configure_port(MX31_AUDMUX_PORT4_SSI_PINS_4,
 			IMX_AUDMUX_V2_PTCR_SYN,
 			IMX_AUDMUX_V2_PDCR_RXDSEL(MX31_AUDMUX_PORT1_SSI0) |