aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorPhilippe R├ętornaz <philippe.retornaz@epfl.ch>2013-10-01 14:36:11 +0200
committerMark Brown <broonie@linaro.org>2013-10-03 16:58:56 +0100
commit1d73ad298d1bfeee5d77c19e5cd667c551e30632 (patch)
tree97c3cabf689b2c997ac87c01e19fa16264e41966 /sound
parentdb8d3af33f7f6e1388a65e847f90bbc8d1ba66ce (diff)
downloadlinux-linaro-stable-1d73ad298d1bfeee5d77c19e5cd667c551e30632.tar.gz
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/fsl/imx-mc13783.c2
1 files changed, 1 insertions, 1 deletions
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) |