[alsa-devel] [PATCH 0/2] ASoC: fsi: modify bug fix
Dear Mark, Liam
These are bug fix for FSI
ASoC: fsi: modify compile error ASoC: fsi-ak4642/fsi-da7210: modify dai link settings for card detect
2nd patch is quick hack for now. I will modify it more wisely in future. but no idea now
Best regards -- Kuninori Morimoto
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- include/sound/sh_fsi.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h index 3fd6456..fa60cbd 100644 --- a/include/sound/sh_fsi.h +++ b/include/sound/sh_fsi.h @@ -114,7 +114,4 @@ struct sh_fsi_platform_info { int (*set_rate)(int is_porta, int rate); /* for master mode */ };
-extern struct snd_soc_dai_driver fsi_soc_dai[2]; -extern struct snd_soc_platform_driver fsi_soc_platform; - #endif /* __SOUND_FSI_H */
On Mon, 2010-08-30 at 19:40 +0900, Kuninori Morimoto wrote:
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
include/sound/sh_fsi.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h index 3fd6456..fa60cbd 100644 --- a/include/sound/sh_fsi.h +++ b/include/sound/sh_fsi.h @@ -114,7 +114,4 @@ struct sh_fsi_platform_info { int (*set_rate)(int is_porta, int rate); /* for master mode */ };
-extern struct snd_soc_dai_driver fsi_soc_dai[2]; -extern struct snd_soc_platform_driver fsi_soc_platform;
#endif /* __SOUND_FSI_H */
Acked-by: Liam Girdwood lrg@slimlogic.co.uk
This patch modify dai link - platform_name: sh_fsi/sh_fsi2 are used for FSI driver - codec_name: ak4642/ak4643 are used for ak4642 driver
This is quick hack. I should modify it more wisely in future
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/sh/fsi-ak4642.c | 7 ++++++- sound/soc/sh/fsi-da7210.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/sound/soc/sh/fsi-ak4642.c b/sound/soc/sh/fsi-ak4642.c index 9e107a9..53836ca 100644 --- a/sound/soc/sh/fsi-ak4642.c +++ b/sound/soc/sh/fsi-ak4642.c @@ -31,8 +31,13 @@ static struct snd_soc_dai_link fsi_dai_link = { .stream_name = "AK4642", .cpu_dai_name = "fsia-dai", /* fsi A */ .codec_dai_name = "ak4642-hifi", - .platform_name = "fsi-pcm-audio", +#ifdef CONFIG_MACH_AP4EVB + .platform_name = "sh_fsi2.0", + .codec_name = "ak4642-codec.0-0013", +#else + .platform_name = "sh_fsi.0", .codec_name = "ak4642-codec.0-0012", +#endif .init = fsi_ak4642_dai_init, .ops = NULL, }; diff --git a/sound/soc/sh/fsi-da7210.c b/sound/soc/sh/fsi-da7210.c index 4f9298f..b527015 100644 --- a/sound/soc/sh/fsi-da7210.c +++ b/sound/soc/sh/fsi-da7210.c @@ -27,7 +27,7 @@ static struct snd_soc_dai_link fsi_da7210_dai = { .stream_name = "DA7210", .cpu_dai_name = "fsib-dai", /* FSI B */ .codec_dai_name = "da7210-hifi", - .platform_name = "fsi-pcm-audio", + .platform_name = "sh_fsi.0", .codec_name = "da7210-codec.0-001a", .init = fsi_da7210_init, };
On Mon, 2010-08-30 at 20:47 +0900, Kuninori Morimoto wrote:
This patch modify dai link
- platform_name: sh_fsi/sh_fsi2 are used for FSI driver
- codec_name: ak4642/ak4643 are used for ak4642 driver
This is quick hack. I should modify it more wisely in future
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
sound/soc/sh/fsi-ak4642.c | 7 ++++++- sound/soc/sh/fsi-da7210.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/sound/soc/sh/fsi-ak4642.c b/sound/soc/sh/fsi-ak4642.c index 9e107a9..53836ca 100644 --- a/sound/soc/sh/fsi-ak4642.c +++ b/sound/soc/sh/fsi-ak4642.c @@ -31,8 +31,13 @@ static struct snd_soc_dai_link fsi_dai_link = { .stream_name = "AK4642", .cpu_dai_name = "fsia-dai", /* fsi A */ .codec_dai_name = "ak4642-hifi",
- .platform_name = "fsi-pcm-audio",
+#ifdef CONFIG_MACH_AP4EVB
- .platform_name = "sh_fsi2.0",
- .codec_name = "ak4642-codec.0-0013",
+#else
- .platform_name = "sh_fsi.0", .codec_name = "ak4642-codec.0-0012",
+#endif .init = fsi_ak4642_dai_init, .ops = NULL, }; diff --git a/sound/soc/sh/fsi-da7210.c b/sound/soc/sh/fsi-da7210.c index 4f9298f..b527015 100644 --- a/sound/soc/sh/fsi-da7210.c +++ b/sound/soc/sh/fsi-da7210.c @@ -27,7 +27,7 @@ static struct snd_soc_dai_link fsi_da7210_dai = { .stream_name = "DA7210", .cpu_dai_name = "fsib-dai", /* FSI B */ .codec_dai_name = "da7210-hifi",
- .platform_name = "fsi-pcm-audio",
- .platform_name = "sh_fsi.0", .codec_name = "da7210-codec.0-001a", .init = fsi_da7210_init,
};
Acked-by: Liam Girdwood lrg@slimlogic.co.uk
Dear Mark
These are bug fix for FSI
ASoC: fsi: modify compile error ASoC: fsi-ak4642/fsi-da7210: modify dai link settings for card detect2nd patch is quick hack for now. I will modify it more wisely in future. but no idea now
These 2 are for Mark's "for-2.6.37" branch
Best regards -- Kuninori Morimoto
On Mon, Aug 30, 2010 at 08:46:20PM +0900, Kuninori Morimoto wrote:
Dear Mark, Liam
These are bug fix for FSI
ASoC: fsi: modify compile error ASoC: fsi-ak4642/fsi-da7210: modify dai link settings for card detect
Applied both, thanks.
2nd patch is quick hack for now. I will modify it more wisely in future. but no idea now
For this we probably want to support wildcard matches that don't specify the address for the CODEC. Otherwise you probably want to do machine_is_() checks when probing the driver and assign the codec name based on those.
participants (3)
-
Kuninori Morimoto -
Liam Girdwood -
Mark Brown