Skip to content

Commit

Permalink
ASoC: Make S3C64xx clock export function to return struct clk
Browse files Browse the repository at this point in the history
This makes the interface usable with the s3c-iis-v2 rate calculator
and consistent with S3C2412.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Apr 30, 2009
1 parent 8a0f62b commit 5143844
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 3 additions & 4 deletions sound/soc/s3c24xx/s3c64xx-i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,13 @@ static int s3c64xx_i2s_set_sysclk(struct snd_soc_dai *cpu_dai,
return 0;
}


unsigned long s3c64xx_i2s_get_clockrate(struct snd_soc_dai *dai)
struct clk *s3c64xx_i2s_get_clock(struct snd_soc_dai *dai)
{
struct s3c_i2sv2_info *i2s = to_info(dai);

return clk_get_rate(i2s->iis_cclk);
return i2s->iis_cclk;
}
EXPORT_SYMBOL_GPL(s3c64xx_i2s_get_clockrate);
EXPORT_SYMBOL_GPL(s3c64xx_i2s_get_clock);

static int s3c64xx_i2s_probe(struct platform_device *pdev,
struct snd_soc_dai *dai)
Expand Down
4 changes: 3 additions & 1 deletion sound/soc/s3c24xx/s3c64xx-i2s.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
#ifndef __SND_SOC_S3C24XX_S3C64XX_I2S_H
#define __SND_SOC_S3C24XX_S3C64XX_I2S_H __FILE__

struct clk;

#include "s3c-i2s-v2.h"

#define S3C64XX_DIV_BCLK S3C_I2SV2_DIV_BCLK
Expand All @@ -26,6 +28,6 @@

extern struct snd_soc_dai s3c64xx_i2s_dai[];

extern unsigned long s3c64xx_i2s_get_clockrate(struct snd_soc_dai *cpu_dai);
extern struct clk *s3c64xx_i2s_get_clock(struct snd_soc_dai *dai);

#endif /* __SND_SOC_S3C24XX_S3C64XX_I2S_H */

0 comments on commit 5143844

Please sign in to comment.