From: Kuninori Morimoto Date: Thu, 28 Aug 2014 03:08:06 +0000 (-0700) Subject: ASoC: simple-card: remove dai_link->cpu_dai_name when DT X-Git-Tag: fixes-against-v3.18-rc2~128^2~8^2~2^2~11 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=179949bc04c7157a4b2279f62a842638b61f78f9;p=pandora-kernel.git ASoC: simple-card: remove dai_link->cpu_dai_name when DT f687d900d30a61dda38db2a99239f5284a86a309 (ASoC: simple-card: cpu_dai_name creates confusion when DT case) removed dai_link->cpu_dai_name when DT case, since it uses DT phand in soc_bind_dai_link(). This binding will fail if it has cpu_dai_name. 6a91a17bd7b92b2d2aa9ece85457f52a62fd7708 (ASoC: simple-card: Handle many DAI links) added multi DAI link support to simple-card driver. Then, removing cpu_dai_name was cared only single DAI. But, it is needed in all DT cases. This patch moves it to asoc_simple_card_dai_link_of() so that care about all DAIs. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- Reading git-diff-tree failed