summaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl/fsl_ssi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-04 17:31:40 +0200
committerMark Brown <broonie@linaro.org>2014-08-04 17:31:40 +0200
commite7177999dc0f70000a6c54f77f2fa96abf9320a2 (patch)
tree1557da2e821196e5905573f068b8f396dc25d34a /sound/soc/fsl/fsl_ssi.c
parentMerge remote-tracking branches 'asoc/topic/cs4265', 'asoc/topic/cs42l56', 'as... (diff)
parentASoC: fsl_ssi: Add stream names for DPCM usage (diff)
parentASoC: fsl_asrc: Don't access members of config before checking it (diff)
parentASoC: fsl_spdif: Add support for output sample rates 96kHz and 192kHz (diff)
parentASoC: imx-audmux: Use uintptr_t for port numbers (diff)
downloadlinux-e7177999dc0f70000a6c54f77f2fa96abf9320a2.tar.xz
linux-e7177999dc0f70000a6c54f77f2fa96abf9320a2.zip
Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-asrc', 'asoc/topic/fsl-spdif' and 'asoc/topic/imx-audmux' into asoc-next