[alsa-devel] [PATCH 1/2] ASoC: sh: fsi-ak4642: fixup platform device id

12 Jan 2011

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
---
 sound/soc/sh/fsi-ak4642.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/sound/soc/sh/fsi-ak4642.c b/sound/soc/sh/fsi-ak4642.c
index 88fff23..ce058c7 100644
--- a/sound/soc/sh/fsi-ak4642.c
+++ b/sound/soc/sh/fsi-ak4642.c
@@ -18,6 +18,7 @@ struct fsi_ak4642_data {
    const char *cpu_dai;
    const char *codec;
    const char *platform;
+	int id;
 };
static int fsi_ak4642_dai_init(struct snd_soc_pcm_runtime *rtd)
@@ -66,7 +67,7 @@ static int fsi_ak4642_probe(struct platform_device *pdev)
pdata = (struct fsi_ak4642_data *)id_entry->driver_data;
-	fsi_snd_device = platform_device_alloc("soc-audio", FSI_PORT_A);
+	fsi_snd_device = platform_device_alloc("soc-audio", pdata->id);
    if (!fsi_snd_device)
    	goto out;
@@ -99,6 +100,7 @@ static struct fsi_ak4642_data fsi_a_ak4642 = {
    .cpu_dai	= "fsia-dai",
    .codec		= "ak4642-codec.0-0012",
    .platform	= "sh_fsi.0",
+	.id		= FSI_PORT_A,
 };
static struct fsi_ak4642_data fsi_b_ak4642 = {
@@ -107,6 +109,7 @@ static struct fsi_ak4642_data fsi_b_ak4642 = {
    .cpu_dai	= "fsib-dai",
    .codec		= "ak4642-codec.0-0012",
    .platform	= "sh_fsi.0",
+	.id		= FSI_PORT_B,
 };
static struct fsi_ak4642_data fsi_a_ak4643 = {
@@ -115,6 +118,7 @@ static struct fsi_ak4642_data fsi_a_ak4643 = {
    .cpu_dai	= "fsia-dai",
    .codec		= "ak4642-codec.0-0013",
    .platform	= "sh_fsi.0",
+	.id		= FSI_PORT_A,
 };
static struct fsi_ak4642_data fsi_b_ak4643 = {
@@ -123,6 +127,7 @@ static struct fsi_ak4642_data fsi_b_ak4643 = {
    .cpu_dai	= "fsib-dai",
    .codec		= "ak4642-codec.0-0013",
    .platform	= "sh_fsi.0",
+	.id		= FSI_PORT_B,
 };
static struct fsi_ak4642_data fsi2_a_ak4642 = {
@@ -131,6 +136,7 @@ static struct fsi_ak4642_data fsi2_a_ak4642 = {
    .cpu_dai	= "fsia-dai",
    .codec		= "ak4642-codec.0-0012",
    .platform	= "sh_fsi2",
+	.id		= FSI_PORT_A,
 };
static struct fsi_ak4642_data fsi2_b_ak4642 = {
@@ -139,6 +145,7 @@ static struct fsi_ak4642_data fsi2_b_ak4642 = {
    .cpu_dai	= "fsib-dai",
    .codec		= "ak4642-codec.0-0012",
    .platform	= "sh_fsi2",
+	.id		= FSI_PORT_B,
 };
static struct fsi_ak4642_data fsi2_a_ak4643 = {
@@ -147,6 +154,7 @@ static struct fsi_ak4642_data fsi2_a_ak4643 = {
    .cpu_dai	= "fsia-dai",
    .codec		= "ak4642-codec.0-0013",
    .platform	= "sh_fsi2",
+	.id		= FSI_PORT_A,
 };
static struct fsi_ak4642_data fsi2_b_ak4643 = {
@@ -155,6 +163,7 @@ static struct fsi_ak4642_data fsi2_b_ak4643 = {
    .cpu_dai	= "fsib-dai",
    .codec		= "ak4642-codec.0-0013",
    .platform	= "sh_fsi2",
+	.id		= FSI_PORT_B,
 };
static struct platform_device_id fsi_id_table[] = {
-- 
1.7.1


    