diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-18 14:17:12 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-18 14:17:12 +0100 |
commit | 762f9b185cde6ccadbaf5ca4d2a1c2535a89824b (patch) | |
tree | 428cad1e37a4cd08d51b88cc973c396b05cc5764 /sound/soc/fsl/imx-mc13783.c | |
parent | 61e6cfa80de5760bbe406f4e815b7739205754d2 (diff) | |
parent | 5a6e19bedb13522924f5ee72c1f65b0fb5d33bc0 (diff) |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/soc/fsl/imx-mc13783.c')
-rw-r--r-- | sound/soc/fsl/imx-mc13783.c | 2 |
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) | |