xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'topic/workq-update' into topic/asoc

Browse Source 
Conflicts:
	sound/soc/codecs/wm8350.c
	sound/soc/codecs/wm8753.c
	sound/soc/sh/fsi.c
	sound/soc/soc-core.c
This commit is contained in:
Takashi Iwai
2010-12-13 09:28:43 +01:00
parent 07a9e2b2fb 5b84ba26a9
commit 20aeeb356b
944 changed files with 16575 additions and 7947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sound/soc/sh/fsi.c
View File

@@ -142,6 +142,8 @@ struct fsi_priv {
struct fsi_stream playback;
struct fsi_stream capture;
long rate;
};
struct fsi_core {
@@ -829,10 +831,17 @@ static void fsi_dai_shutdown(struct snd_pcm_substream *substream,
{
struct fsi_priv *fsi = fsi_get_priv(substream);
int is_play = fsi_is_play(substream);
struct fsi_master *master = fsi_get_master(fsi);
int (*set_rate)(struct device *dev, int is_porta, int rate, int enable);
fsi_irq_disable(fsi, is_play);
fsi_clk_ctrl(fsi, 0);
set_rate = master->info->set_rate;
if (set_rate && fsi->rate)
set_rate(dai->dev, fsi_is_port_a(fsi), fsi->rate, 0);
fsi->rate = 0;
pm_runtime_put_sync(dai->dev);
}
@@ -866,20 +875,20 @@ static int fsi_dai_hw_params(struct snd_pcm_substream *substream,
{
struct fsi_priv *fsi = fsi_get_priv(substream);
struct fsi_master *master = fsi_get_master(fsi);
int (*set_rate)(int is_porta, int rate) = master->info->set_rate;
int (*set_rate)(struct device *dev, int is_porta, int rate, int enable);
int fsi_ver = master->core->ver;
int is_play = fsi_is_play(substream);
long rate = params_rate(params);
int ret;
/* if slave mode, set_rate is not needed */
if (!fsi_is_master_mode(fsi, is_play))
set_rate = master->info->set_rate;
if (!set_rate)
return 0;
/* it is error if no set_rate */
if (!set_rate)
return -EIO;
ret = set_rate(dai->dev, fsi_is_port_a(fsi), rate, 1);
if (ret < 0) /* error */
return ret;
ret = set_rate(fsi_is_port_a(fsi), params_rate(params));
fsi->rate = rate;
if (ret > 0) {
u32 data = 0;