From: Philippe Rétornaz Date: Tue, 1 Oct 2013 12:36:11 +0000 (+0200) Subject: ASoC: fsl: Fix sound on mx31moboard X-Git-Tag: v3.12~7^2~7^2~5^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d73ad298d1bfeee5d77c19e5cd667c551e30632;p=kernel%2Fkernel-generic.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 Signed-off-by: Mark Brown --- diff --git a/sound/soc/fsl/imx-mc13783.c b/sound/soc/fsl/imx-mc13783.c index a3d60d4..a2fd732 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) |