diff options
author | Mark Brown <broonie@linaro.org> | 2014-06-01 14:02:07 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-01 14:02:07 +0100 |
commit | 287d414eacaa681413ea89adfa5b3a0d12d2ab1a (patch) | |
tree | a4ef6c55bc2b2177f8a4144663c68e6e345b64cc /sound/soc/fsl/fsl_spdif.c | |
parent | 432481220101166a0b33dc6f951b38a8af3d281c (diff) | |
parent | 7b8751abdd34a2f924c37c29ad61d598f5d29e7b (diff) | |
download | linux-stable-287d414eacaa681413ea89adfa5b3a0d12d2ab1a.tar.gz linux-stable-287d414eacaa681413ea89adfa5b3a0d12d2ab1a.tar.bz2 linux-stable-287d414eacaa681413ea89adfa5b3a0d12d2ab1a.zip |
Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-fsl-ssi
Conflicts:
sound/soc/fsl/Kconfig
Diffstat (limited to 'sound/soc/fsl/fsl_spdif.c')
-rw-r--r-- | sound/soc/fsl/fsl_spdif.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index 6452ca83d889..daa6198ae41f 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -13,18 +13,18 @@ * kind, whether express or implied. */ -#include <linux/module.h> +#include <linux/bitrev.h> #include <linux/clk.h> #include <linux/clk-private.h> -#include <linux/bitrev.h> -#include <linux/regmap.h> +#include <linux/module.h> #include <linux/of_address.h> #include <linux/of_device.h> #include <linux/of_irq.h> +#include <linux/regmap.h> #include <sound/asoundef.h> -#include <sound/soc.h> #include <sound/dmaengine_pcm.h> +#include <sound/soc.h> #include "fsl_spdif.h" #include "imx-pcm.h" @@ -1186,6 +1186,7 @@ static int fsl_spdif_probe(struct platform_device *pdev) static const struct of_device_id fsl_spdif_dt_ids[] = { { .compatible = "fsl,imx35-spdif", }, + { .compatible = "fsl,vf610-spdif", }, {} }; MODULE_DEVICE_TABLE(of, fsl_spdif_dt_ids); |