diff options
| author | Shengjiu Wang <shengjiu.wang@freescale.com> | 2014-10-13 11:26:02 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2015-01-15 21:18:34 -0600 |
| commit | 45567b25994b974482f0648ae106cd7ce102d5df (patch) | |
| tree | f1fe5c157330650ba153406cd0fe0719a14fc37d /sound | |
| parent | 36810a945200968ae3bf91101ee834cbd2373c75 (diff) | |
MLK-9684-2: ASoC: imx-si476x: remove the codec_name, use the codec_of_node
As the codec_name has a suffix, which is a index and is different
for different platform or different kernel. So here change machine driver
to use codec_of_node, which can be same for different platform/kernel,
then we can maintain a same machine driver for fm.
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
(cherry picked from commit e87b135f34cba5cfcd0614b045d4035118fb6d77)
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/imx-si476x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/fsl/imx-si476x.c b/sound/soc/fsl/imx-si476x.c index 6859b38903ee..a80ad54fe30e 100644 --- a/sound/soc/fsl/imx-si476x.c +++ b/sound/soc/fsl/imx-si476x.c @@ -81,7 +81,6 @@ static struct snd_soc_dai_link imx_dai = { .name = "imx-si476x", .stream_name = "imx-si476x", .codec_dai_name = "si476x-codec", - .codec_name = "si476x-codec.355", .ops = &imx_si476x_ops, }; @@ -134,8 +133,8 @@ static int imx_si476x_probe(struct platform_device *pdev) goto end; } - fm_dev = of_find_i2c_device_by_node(fm_np); - if (!fm_dev) { + fm_dev = of_find_i2c_device_by_node(fm_np->parent); + if (!fm_dev || !fm_dev->dev.driver) { dev_err(&pdev->dev, "failed to find FM platform device\n"); ret = -EINVAL; goto end; @@ -144,6 +143,7 @@ static int imx_si476x_probe(struct platform_device *pdev) card->dev = &pdev->dev; card->dai_link->cpu_dai_name = dev_name(&ssi_pdev->dev); card->dai_link->platform_of_node = ssi_np; + card->dai_link->codec_of_node = fm_np; platform_set_drvdata(pdev, card); |