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

Commit 8bb01489 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Add S3C64xx IIS CDCLK source selection 



CDCLK can either be an output generated by the CPU, intended for use
as the CODEC master clock, or an input (probably from the CODEC)
providing a master clock for the IIS block.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 9b95b166

arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 
#define S3C2412_IISMOD_BCLK_MASK	(3 << 1)

#define S3C2412_IISMOD_8BIT		(1 << 0)



#define S3C64XX_IISMOD_CDCLKCON		(1 << 12)



#define S3C2412_IISPSR_PSREN		(1 << 15)



#define S3C2412_IISFIC_TXFLUSH		(1 << 15)

sound/soc/s3c24xx/s3c64xx-i2s.c

+13 −0
Original line number Diff line number Diff line
@@ -99,6 +99,19 @@ static int s3c64xx_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, 
		iismod |= S3C64XX_IISMOD_IMS_SYSMUX;

		break;



	case S3C64XX_CLKSRC_CDCLK:

		switch (dir) {

		case SND_SOC_CLOCK_IN:

			iismod |= S3C64XX_IISMOD_CDCLKCON;

			break;

		case SND_SOC_CLOCK_OUT:

			iismod &= ~S3C64XX_IISMOD_CDCLKCON;

			break;

		default:

			return -EINVAL;

		}

		break;



	default:

		return -EINVAL;

	}

sound/soc/s3c24xx/s3c64xx-i2s.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ struct clk; 


#define S3C64XX_CLKSRC_PCLK	(0)

#define S3C64XX_CLKSRC_MUX	(1)

#define S3C64XX_CLKSRC_CDCLK    (2)



extern struct snd_soc_dai s3c64xx_i2s_dai[];