|
@@ -25,6 +25,7 @@ struct graph_card_data {
|
|
|
struct graph_dai_props {
|
|
|
struct asoc_simple_dai cpu_dai;
|
|
|
struct asoc_simple_dai codec_dai;
|
|
|
+ struct snd_soc_dai_link_component codecs; /* single codec */
|
|
|
unsigned int mclk_fs;
|
|
|
} *dai_props;
|
|
|
unsigned int mclk_fs;
|
|
@@ -213,7 +214,7 @@ static int asoc_graph_card_dai_link_of(struct device_node *cpu_port,
|
|
|
ret = asoc_simple_card_set_dailink_name(dev, dai_link,
|
|
|
"%s-%s",
|
|
|
dai_link->cpu_dai_name,
|
|
|
- dai_link->codec_dai_name);
|
|
|
+ dai_link->codecs->dai_name);
|
|
|
if (ret < 0)
|
|
|
goto dai_link_of_err;
|
|
|
|
|
@@ -299,7 +300,7 @@ static int asoc_graph_card_probe(struct platform_device *pdev)
|
|
|
struct graph_dai_props *dai_props;
|
|
|
struct device *dev = &pdev->dev;
|
|
|
struct snd_soc_card *card;
|
|
|
- int num, ret;
|
|
|
+ int num, ret, i;
|
|
|
|
|
|
/* Allocate the private data and the DAI link array */
|
|
|
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
|
|
@@ -315,6 +316,17 @@ static int asoc_graph_card_probe(struct platform_device *pdev)
|
|
|
if (!dai_props || !dai_link)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
+ /*
|
|
|
+ * Use snd_soc_dai_link_component instead of legacy style
|
|
|
+ * It is codec only. but cpu/platform will be supported in the future.
|
|
|
+ * see
|
|
|
+ * soc-core.c :: snd_soc_init_multicodec()
|
|
|
+ */
|
|
|
+ for (i = 0; i < num; i++) {
|
|
|
+ dai_link[i].codecs = &dai_props[i].codecs;
|
|
|
+ dai_link[i].num_codecs = 1;
|
|
|
+ }
|
|
|
+
|
|
|
priv->pa_gpio = devm_gpiod_get_optional(dev, "pa", GPIOD_OUT_LOW);
|
|
|
if (IS_ERR(priv->pa_gpio)) {
|
|
|
ret = PTR_ERR(priv->pa_gpio);
|