This is very rough patch for maging codec <-> component. we need exchange codec_dai name on platform if codec driver was 1-dai.
this patch includes component_driver on codec. it has .name only now...
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +- sound/soc/codecs/wm8978.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index c5be60d..dd2b9e0 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -950,7 +950,7 @@ static struct asoc_simple_card_info fsi_wm8978_info = { .fmt = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_IB_NF, }, .codec_dai = { - .name = "wm8978-hifi", + .name = "wm8978.0-001a", .fmt = SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_NB_NF, .sysclk = 12288000, }, diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index d8fc531..352f8ff 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c @@ -1009,6 +1009,10 @@ static int wm8978_remove(struct snd_soc_codec *codec) return 0; }
+static struct snd_soc_component_driver soc_component_dev = { + .name = "wm8978", +}; + static struct snd_soc_codec_driver soc_codec_dev_wm8978 = { .probe = wm8978_probe, .remove = wm8978_remove, @@ -1022,6 +1026,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8978 = { .num_dapm_widgets = ARRAY_SIZE(wm8978_dapm_widgets), .dapm_routes = wm8978_dapm_routes, .num_dapm_routes = ARRAY_SIZE(wm8978_dapm_routes), + + .component_driver = &soc_component_dev, };
static const struct regmap_config wm8978_regmap_config = {