diff options
-rw-r--r-- | sound/soc/s3c24xx/s3c-i2s-v2.h | 4 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c2412-i2s.h | 4 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c64xx-i2s.h | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.h b/sound/soc/s3c24xx/s3c-i2s-v2.h index ecf8eaaed1db..b094d3c23cbe 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.h +++ b/sound/soc/s3c24xx/s3c-i2s-v2.h | |||
@@ -25,6 +25,10 @@ | |||
25 | #define S3C_I2SV2_DIV_RCLK (2) | 25 | #define S3C_I2SV2_DIV_RCLK (2) |
26 | #define S3C_I2SV2_DIV_PRESCALER (3) | 26 | #define S3C_I2SV2_DIV_PRESCALER (3) |
27 | 27 | ||
28 | #define S3C_I2SV2_CLKSRC_PCLK 0 | ||
29 | #define S3C_I2SV2_CLKSRC_AUDIOBUS 1 | ||
30 | #define S3C_I2SV2_CLKSRC_CDCLK 2 | ||
31 | |||
28 | /** | 32 | /** |
29 | * struct s3c_i2sv2_info - S3C I2S-V2 information | 33 | * struct s3c_i2sv2_info - S3C I2S-V2 information |
30 | * @dev: The parent device passed to use from the probe. | 34 | * @dev: The parent device passed to use from the probe. |
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.h b/sound/soc/s3c24xx/s3c2412-i2s.h index 92848e54be16..60cac002a830 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.h +++ b/sound/soc/s3c24xx/s3c2412-i2s.h | |||
@@ -21,8 +21,8 @@ | |||
21 | #define S3C2412_DIV_RCLK S3C_I2SV2_DIV_RCLK | 21 | #define S3C2412_DIV_RCLK S3C_I2SV2_DIV_RCLK |
22 | #define S3C2412_DIV_PRESCALER S3C_I2SV2_DIV_PRESCALER | 22 | #define S3C2412_DIV_PRESCALER S3C_I2SV2_DIV_PRESCALER |
23 | 23 | ||
24 | #define S3C2412_CLKSRC_PCLK (0) | 24 | #define S3C2412_CLKSRC_PCLK S3C_I2SV2_CLKSRC_PCLK |
25 | #define S3C2412_CLKSRC_I2SCLK (1) | 25 | #define S3C2412_CLKSRC_I2SCLK S3C_I2SV2_CLKSRC_AUDIOBUS |
26 | 26 | ||
27 | extern struct clk *s3c2412_get_iisclk(void); | 27 | extern struct clk *s3c2412_get_iisclk(void); |
28 | 28 | ||
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.h b/sound/soc/s3c24xx/s3c64xx-i2s.h index abe7253b55fc..e350d280cd7a 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.h +++ b/sound/soc/s3c24xx/s3c64xx-i2s.h | |||
@@ -23,9 +23,9 @@ struct clk; | |||
23 | #define S3C64XX_DIV_RCLK S3C_I2SV2_DIV_RCLK | 23 | #define S3C64XX_DIV_RCLK S3C_I2SV2_DIV_RCLK |
24 | #define S3C64XX_DIV_PRESCALER S3C_I2SV2_DIV_PRESCALER | 24 | #define S3C64XX_DIV_PRESCALER S3C_I2SV2_DIV_PRESCALER |
25 | 25 | ||
26 | #define S3C64XX_CLKSRC_PCLK (0) | 26 | #define S3C64XX_CLKSRC_PCLK S3C_I2SV2_CLKSRC_PCLK |
27 | #define S3C64XX_CLKSRC_MUX (1) | 27 | #define S3C64XX_CLKSRC_MUX S3C_I2SV2_CLKSRC_AUDIOBUS |
28 | #define S3C64XX_CLKSRC_CDCLK (2) | 28 | #define S3C64XX_CLKSRC_CDCLK S3C_I2SV2_CLKSRC_CDCLK |
29 | 29 | ||
30 | extern struct snd_soc_dai s3c64xx_i2s_dai[]; | 30 | extern struct snd_soc_dai s3c64xx_i2s_dai[]; |
31 | 31 | ||