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

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

ASoC: S3C64XX: I2S: Use s3c2412 defines 



Now that the fields are defined for s3c2412, use them and avoid having
multiple copies of same defines.

Signed-off-by: default avatarJassi Brar <jassi.brar@samsung.com>
Acked-by: default avatarBen Dooks <ben-linux@fluff.org>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 57282427

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

+0 −3
Original line number Diff line number Diff line
@@ -73,9 +73,6 @@ 
#define S3C64XX_IISMOD_BLC_24BIT	(2 << 13)

#define S3C64XX_IISMOD_BLC_MASK		(3 << 13)



#define S3C64XX_IISMOD_IMS_PCLK		(0 << 10)

#define S3C64XX_IISMOD_IMS_SYSMUX	(1 << 10)



#define S3C2412_IISMOD_IMS_SYSMUX	(1 << 10)

#define S3C2412_IISMOD_SLAVE		(1 << 11)

#define S3C2412_IISMOD_MODE_TXONLY	(0 << 8)

sound/soc/s3c24xx/s3c64xx-i2s.c

+2 −2
Original line number Diff line number Diff line
@@ -62,11 +62,11 @@ static int s3c64xx_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, 


	switch (clk_id) {

	case S3C64XX_CLKSRC_PCLK:

		iismod &= ~S3C64XX_IISMOD_IMS_SYSMUX;

		iismod &= ~S3C2412_IISMOD_IMS_SYSMUX;

		break;



	case S3C64XX_CLKSRC_MUX:

		iismod |= S3C64XX_IISMOD_IMS_SYSMUX;

		iismod |= S3C2412_IISMOD_IMS_SYSMUX;

		break;



	case S3C64XX_CLKSRC_CDCLK: