diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2010-11-19 02:23:17 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-24 01:31:00 -0500 |
commit | 22de4e1fe446794acaebdf19dcaff4256d659972 (patch) | |
tree | daafc6b0c41ef1c0ad6f4cab642994523096e743 /sound | |
parent | d4bc99b977e3a1dd10a84a01ebe59ac2ccebf0cd (diff) |
ARM: mach-shmobile: ap4evb: FSI clock use proper process for ak4642
Current AP4 FSI didn't use set_rate for ak4642,
and used dummy rate when init.
And FSI driver was modified to always call set_rate.
The user which are using FSI set_rate is only AP4 now.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/sh/fsi.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 136414f163e9..4c2404b1b862 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c | |||
@@ -902,18 +902,12 @@ static int fsi_dai_hw_params(struct snd_pcm_substream *substream, | |||
902 | struct fsi_master *master = fsi_get_master(fsi); | 902 | struct fsi_master *master = fsi_get_master(fsi); |
903 | int (*set_rate)(struct device *dev, int is_porta, int rate, int enable); | 903 | int (*set_rate)(struct device *dev, int is_porta, int rate, int enable); |
904 | int fsi_ver = master->core->ver; | 904 | int fsi_ver = master->core->ver; |
905 | int is_play = fsi_is_play(substream); | ||
906 | long rate = params_rate(params); | 905 | long rate = params_rate(params); |
907 | int ret; | 906 | int ret; |
908 | 907 | ||
909 | /* if slave mode, set_rate is not needed */ | ||
910 | if (!fsi_is_master_mode(fsi, is_play)) | ||
911 | return 0; | ||
912 | |||
913 | /* it is error if no set_rate */ | ||
914 | set_rate = master->info->set_rate; | 908 | set_rate = master->info->set_rate; |
915 | if (!set_rate) | 909 | if (!set_rate) |
916 | return -EIO; | 910 | return 0; |
917 | 911 | ||
918 | ret = set_rate(dai->dev, fsi_is_port_a(fsi), rate, 1); | 912 | ret = set_rate(dai->dev, fsi_is_port_a(fsi), rate, 1); |
919 | if (ret < 0) /* error */ | 913 | if (ret < 0) /* error */ |