Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4793d6af authored by Jassi Brar's avatar Jassi Brar Committed by Mark Brown
Browse files

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: default avatarJassi Brar <jassi.brar@samsung.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 08226614

sound/soc/s3c24xx/s3c-i2s-v2.h

+4 −0
Original line number Diff line number Diff line
@@ -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.

sound/soc/s3c24xx/s3c2412-i2s.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

sound/soc/s3c24xx/s3c64xx-i2s.h

+3 −3
Original line number Diff line number Diff line
@@ -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[];