ASoC: S3C: I2Sv2: Unify clock source IDs

Rather than having the multiple definitions of the same clocks,
define them in one common place and refer by SoC specific names.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.h b/sound/soc/s3c24xx/s3c-i2s-v2.h
index ecf8eaaed1db7a4c61e561c831a186d5b6a3c6e2..b094d3c23cbe47db0b1a7ea5d641ab9941487348 100644 (file)
--- a/sound/soc/s3c24xx/s3c-i2s-v2.h
+++ b/sound/soc/s3c24xx/s3c-i2s-v2.h
@@ -25,6 +25,10 @@
 #define S3C_I2SV2_DIV_RCLK     (2)
 #define S3C_I2SV2_DIV_PRESCALER        (3)
 
+#define S3C_I2SV2_CLKSRC_PCLK          0
+#define S3C_I2SV2_CLKSRC_AUDIOBUS      1
+#define S3C_I2SV2_CLKSRC_CDCLK         2
+
 /**
  * struct s3c_i2sv2_info - S3C I2S-V2 information
  * @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 92848e54be16d049a71b7b7f91bdbe6df04a878e..60cac002a8303620b44bad4bf9056fa7e8c2c754 100644 (file)
--- a/sound/soc/s3c24xx/s3c2412-i2s.h
+++ b/sound/soc/s3c24xx/s3c2412-i2s.h
@@ -21,8 +21,8 @@
 #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)
+#define S3C2412_CLKSRC_PCLK    S3C_I2SV2_CLKSRC_PCLK
+#define S3C2412_CLKSRC_I2SCLK  S3C_I2SV2_CLKSRC_AUDIOBUS
 
 extern struct clk *s3c2412_get_iisclk(void);
 

diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.h b/sound/soc/s3c24xx/s3c64xx-i2s.h
index abe7253b55fc37bf72447c69ea7e80feeb9b23b0..e350d280cd7a1252f095cee8bcec43eb3ec4c899 100644 (file)
--- a/sound/soc/s3c24xx/s3c64xx-i2s.h
+++ b/sound/soc/s3c24xx/s3c64xx-i2s.h
@@ -23,9 +23,9 @@ struct clk;
 #define S3C64XX_DIV_RCLK       S3C_I2SV2_DIV_RCLK
 #define S3C64XX_DIV_PRESCALER  S3C_I2SV2_DIV_PRESCALER
 
-#define S3C64XX_CLKSRC_PCLK    (0)
-#define S3C64XX_CLKSRC_MUX     (1)
-#define S3C64XX_CLKSRC_CDCLK    (2)
+#define S3C64XX_CLKSRC_PCLK    S3C_I2SV2_CLKSRC_PCLK
+#define S3C64XX_CLKSRC_MUX     S3C_I2SV2_CLKSRC_AUDIOBUS
+#define S3C64XX_CLKSRC_CDCLK    S3C_I2SV2_CLKSRC_CDCLK
 
 extern struct snd_soc_dai s3c64xx_i2s_dai[];