ASoC: simple-card: don't select DPCM via simple-audio-card

Commit Message

Kuninori Morimoto April 2, 2019, 1:51 a.m. UTC

From: Kuninori Morimoto <[e-mail]>

commit da215354eb55c ("ASoC: simple-card: merge simple-scu-card")
merged simple-scu-audio-card which can handle DPCM into
simple-audio-card.

By this patch, the judgement to select "normal sound card" or
"DPCM sound card" is based on its CPU/Codec DAI count.
But, because of it, existing "simple-audio-card" user who is
assuming "normal sound card" might select DPCM unintentionally.

To solve this issue, this patch allows "simple-audio-card" user
can select "normal sound card", and "simple-scu-audio-card" user
can select both "normal sound card" and "DPCM sound card".
This keeps compatibility collectry.

Signed-off-by: Kuninori Morimoto <[e-mail]>
---
 sound/soc/generic/simple-card.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Comments

Kuninori Morimoto April 4, 2019, 12:20 a.m. UTC | #1

Hi Mark

> From: Kuninori Morimoto <[e-mail]>
> 
> commit da215354eb55c ("ASoC: simple-card: merge simple-scu-card")
> merged simple-scu-audio-card which can handle DPCM into
> simple-audio-card.
> 
> By this patch, the judgement to select "normal sound card" or
> "DPCM sound card" is based on its CPU/Codec DAI count.
> But, because of it, existing "simple-audio-card" user who is
> assuming "normal sound card" might select DPCM unintentionally.
> 
> To solve this issue, this patch allows "simple-audio-card" user
> can select "normal sound card", and "simple-scu-audio-card" user
> can select both "normal sound card" and "DPCM sound card".
> This keeps compatibility collectry.
> 
> Signed-off-by: Kuninori Morimoto <[e-mail]>
> ---

This patch is for v5.1, too

Patch

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 7147bba..34de32e 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
+
 struct simple_priv {
 	struct snd_soc_card snd_card;
 	struct simple_dai_props {
@@ -441,6 +444,7 @@  static int simple_for_each_link(struct 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;
 
@@ -480,8 +484,9 @@  static int simple_for_each_link(struct 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
@@ -822,7 +827,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);