diff options
| author | Mark Brown <broonie@kernel.org> | 2019-04-04 15:07:34 +0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-04-04 15:07:34 +0700 |
| commit | 072cb68a43663eacae7fe84dcbfd1a81dc692185 (patch) | |
| tree | 95107e9ba2b85f6aabee0c830603a2cc48d32d07 /sound/soc/generic/simple-card.c | |
| parent | 252163a66a06859f468ef1e00fa5a1f377b16eed (diff) | |
| parent | 86a7b6ffd90095d81d9fa0d8b48955b7c83b2e2f (diff) | |
Merge branch 'asoc-5.1' into asoc-5.2
Diffstat (limited to 'sound/soc/generic/simple-card.c')
| -rw-r--r-- | sound/soc/generic/simple-card.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index dd9ac60d61f1..335ead0cbb8a 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -9,12 +9,15 @@ #include <linux/device.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/string.h> #include <sound/simple_card.h> #include <sound/soc-dai.h> #include <sound/soc.h> +#define DPCM_SELECTABLE 1 + #define DAI "sound-dai" #define CELL "#sound-dai-cells" #define PREFIX "simple-audio-card," @@ -349,6 +352,7 @@ static int simple_for_each_link(struct asoc_simple_priv *priv, struct device *dev = simple_priv_to_dev(priv); struct device_node *top = dev->of_node; struct device_node *node; + uintptr_t dpcm_selectable = (uintptr_t)of_device_get_match_data(dev); bool is_top = 0; int ret = 0; @@ -388,8 +392,9 @@ static int simple_for_each_link(struct asoc_simple_priv *priv, * if it has many CPUs, * or has convert-xxx property */ - if (num > 2 || - adata.convert_rate || adata.convert_channels) + if (dpcm_selectable && + (num > 2 || + adata.convert_rate || adata.convert_channels)) ret = func_dpcm(priv, np, codec, li, is_top); /* else normal sound */ else @@ -705,7 +710,8 @@ static int simple_remove(struct platform_device *pdev) static const struct of_device_id simple_of_match[] = { { .compatible = "simple-audio-card", }, - { .compatible = "simple-scu-audio-card", }, + { .compatible = "simple-scu-audio-card", + .data = (void *)DPCM_SELECTABLE }, {}, }; MODULE_DEVICE_TABLE(of, simple_of_match); |