From: Kuninori Morimoto Date: Fri, 18 Oct 2013 05:51:40 +0000 (-0700) Subject: ASoC: rcar: remove RSND_SSI_CLK_FROM_ADG X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~14^2~72^2~17^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92eba04e4bcd469518cc759ac1bf1a49acaa5cc1;p=pandora-kernel.git ASoC: rcar: remove RSND_SSI_CLK_FROM_ADG R-Car sound has clock pin for each SSI, and sometimes, these pins are shared with paired SSI. It may sometimes become "SSI-A clock pin is master" and "SSI-B clock pin is slave", but "SSI-A/B clock pins are shared". SSI-B needs SSI-A clock in this case. Current R-Car sound driver is using RSND_SSI_xxx flag to control this kind of shared pin behavior. But, this information, especially clock master setting, can be got from ASoC set_fmt settings. This patch removes rsnd_ssi_mode_init() and extend rsnd_ssi_mode_set() to controlling pin settings via .set_fmt. This patch doesn't removes RSND_SSI_CLK_FROM_ADG flag at this point to avoid conflict branch merging between ASoC <-> SH-ARM. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- Reading git-diff-tree failed