summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorNicolin Chen <b42378@freescale.com>2013-05-17 19:48:34 +0800
committerNicolin Chen <b42378@freescale.com>2013-05-20 15:49:28 +0800
commit38b47c8b3fc9fa1b92baa2deec00d9b181b14313 (patch)
tree74698ae9c5825662be560afe5f3300a14ef22af2 /sound
parentb8fa4d7407ccfbecc754d2ca28344fa4e03173ee (diff)
ENGR00263135-4 asoc: imx-wm8962: specify the alias id in machine driver
since we use alias id to create alsa platform driver, we should tell machine driver the exact id of it. Acked-by: Wang Shengjiu <b02247@freescale.com> Signed-off-by: Nicolin Chen <b42378@freescale.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/fsl/imx-wm8962.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c
index 94608757ae9c..99399b7bd958 100644
--- a/sound/soc/fsl/imx-wm8962.c
+++ b/sound/soc/fsl/imx-wm8962.c
@@ -464,6 +464,7 @@ static int __devinit imx_wm8962_probe(struct platform_device *pdev)
struct i2c_client *codec_dev;
struct imx_wm8962_data *data;
int int_port, ext_port;
+ char platform_name[32];
int ret;
priv->pdev = pdev;
@@ -545,7 +546,9 @@ static int __devinit imx_wm8962_probe(struct platform_device *pdev)
data->dai.codec_dai_name = "wm8962";
data->dai.codec_of_node = codec_np;
data->dai.cpu_dai_name = dev_name(&ssi_pdev->dev);
- data->dai.platform_name = "imx-pcm-audio";
+
+ sprintf(platform_name, "imx-pcm-audio.%d", of_alias_get_id(ssi_np, "audio"));
+ data->dai.platform_name = platform_name;
data->dai.init = &imx_wm8962_dai_init;
data->dai.ops = &imx_hifi_ops;
data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |