diff options
author | Jassi Brar <jassi.brar@samsung.com> | 2010-04-27 02:56:45 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-05 10:13:20 -0400 |
commit | 5728242789d3538abcfdcb28e01798801efd9988 (patch) | |
tree | e7610d08a85bd67da0dd82994a286a53e55e19e9 /sound/soc/s3c24xx/s3c2412-i2s.c | |
parent | 21a7ad08e274ce7b669b165d65e0bab8391552a6 (diff) |
ASoC: S3C: I2Sv2: Unify i2s_get_clock callback
Now that we have two callbacks s3c2412_i2s_get_clock & s3c64xx_i2s_get_clock
doing exactly the same thing, we can define one generic s3c_i2sv2_get_clock
and discard other two copies. Also, switch the users to make calls to the
newly defined and generic s3c_i2sv2_get_clock
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/s3c24xx/s3c2412-i2s.c')
-rw-r--r-- | sound/soc/s3c24xx/s3c2412-i2s.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index ce2daacc4eb9..6b884d75235e 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c | |||
@@ -91,19 +91,6 @@ static int s3c2412_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, | |||
91 | return 0; | 91 | return 0; |
92 | } | 92 | } |
93 | 93 | ||
94 | |||
95 | struct clk *s3c2412_get_iisclk(void) | ||
96 | { | ||
97 | struct s3c_i2sv2_info *i2s = &s3c2412_i2s; | ||
98 | u32 iismod = readl(i2s->regs + S3C2412_IISMOD); | ||
99 | |||
100 | if (iismod & S3C2412_IISMOD_IMS_SYSMUX) | ||
101 | return i2s->iis_cclk; | ||
102 | else | ||
103 | return i2s->iis_pclk; | ||
104 | } | ||
105 | EXPORT_SYMBOL_GPL(s3c2412_get_iisclk); | ||
106 | |||
107 | static inline struct s3c_i2sv2_info *to_info(struct snd_soc_dai *cpu_dai) | 94 | static inline struct s3c_i2sv2_info *to_info(struct snd_soc_dai *cpu_dai) |
108 | { | 95 | { |
109 | return cpu_dai->private_data; | 96 | return cpu_dai->private_data; |