diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-29 01:24:12 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-29 01:24:12 +0300 |
| commit | d00ab2fdd4dc4361c97777bc1fef7234329d4659 (patch) | |
| tree | b8d8f98c1af633bbc1570b4270b39727737beebf /sound/soc/s3c24xx/s3c2412-i2s.h | |
| parent | 88f502fedba82eff252b6420e8b8328e4ae25c67 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
| download | linux-d00ab2fdd4dc4361c97777bc1fef7234329d4659.tar.xz | |
Merge branch 'linus' into core/futexes
Diffstat (limited to 'sound/soc/s3c24xx/s3c2412-i2s.h')
| -rw-r--r-- | sound/soc/s3c24xx/s3c2412-i2s.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.h b/sound/soc/s3c24xx/s3c2412-i2s.h index aac08a25e541..92848e54be16 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.h +++ b/sound/soc/s3c24xx/s3c2412-i2s.h @@ -15,9 +15,11 @@ #ifndef __SND_SOC_S3C24XX_S3C2412_I2S_H #define __SND_SOC_S3C24XX_S3C2412_I2S_H __FILE__ -#define S3C2412_DIV_BCLK (1) -#define S3C2412_DIV_RCLK (2) -#define S3C2412_DIV_PRESCALER (3) +#include "s3c-i2s-v2.h" + +#define S3C2412_DIV_BCLK S3C_I2SV2_DIV_BCLK +#define S3C2412_DIV_RCLK S3C_I2SV2_DIV_RCLK +#define S3C2412_DIV_PRESCALER S3C_I2SV2_DIV_PRESCALER #define S3C2412_CLKSRC_PCLK (0) #define S3C2412_CLKSRC_I2SCLK (1) @@ -26,13 +28,4 @@ extern struct clk *s3c2412_get_iisclk(void); extern struct snd_soc_dai s3c2412_i2s_dai; -struct s3c2412_rate_calc { - unsigned int clk_div; /* for prescaler */ - unsigned int fs_div; /* for root frame clock */ -}; - -extern int s3c2412_iis_calc_rate(struct s3c2412_rate_calc *info, - unsigned int *fstab, - unsigned int rate, struct clk *clk); - #endif /* __SND_SOC_S3C24XX_S3C2412_I2S_H */ |