From: Kuninori Morimoto Date: Fri, 22 Mar 2013 07:54:50 +0000 (-0700) Subject: ASoC: switch over to use snd_soc_register_component() on sh4 siu X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~52^2~42^2~24^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a09dfa04177df5a2e9eeeeaf527efd35c531d11;p=pandora-kernel.git ASoC: switch over to use snd_soc_register_component() on sh4 siu siu_dai.c is using snd_soc_register_dais(), even though array size of siu_i2s_dai is 1. OTOH, new API snd_soc_register_component() uses properly snd_soc_register_dai() (henceforth dai()) or snd_soc_register_dais() (henceforth dais()) via num_dai. Then, cpu_dai_name will be "siu-i2s-dai" if dais() was used, and it will be "siu-pcm-audio" if dai() was used. Therefore this patch fixup migor_dai :: cpu_dai_name too. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- Reading git-diff-tree failed