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

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

ASoC: S3C: I2Sv2: Reject immidiate register value 



Towards generalizing CPU driver interface, do not accept direct field
values for the BCLK and RCLK.
The machine driver should simply request the FS-multiple and not provide
the value to be set in divide field of IISMOD.

[Confirmed by Jassi that no existing machine drivers are affected --
broonie]

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 fa6231e1

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

+30 −38
Original line number Diff line number Diff line
@@ -463,9 +463,6 @@ static int s3c2412_i2s_set_clkdiv(struct snd_soc_dai *cpu_dai, 


	switch (div_id) {

	case S3C_I2SV2_DIV_BCLK:

		if (div > 3) {

			/* convert value to bit field */



		switch (div) {

		case 16:

			div = S3C2412_IISMOD_BCLK_16FS;
@@ -486,7 +483,6 @@ static int s3c2412_i2s_set_clkdiv(struct snd_soc_dai *cpu_dai, 
		default:

			return -EINVAL;

		}

		}



		reg = readl(i2s->regs + S3C2412_IISMOD);

		reg &= ~S3C2412_IISMOD_BCLK_MASK;
@@ -496,9 +492,6 @@ static int s3c2412_i2s_set_clkdiv(struct snd_soc_dai *cpu_dai, 
		break;



	case S3C_I2SV2_DIV_RCLK:

		if (div > 3) {

			/* convert value to bit field */



		switch (div) {

		case 256:

			div = S3C2412_IISMOD_RCLK_256FS;
@@ -519,7 +512,6 @@ static int s3c2412_i2s_set_clkdiv(struct snd_soc_dai *cpu_dai, 
		default:

			return -EINVAL;

		}

		}



		reg = readl(i2s->regs + S3C2412_IISMOD);

		reg &= ~S3C2412_IISMOD_RCLK_MASK;