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

Unverified Commit 45ae70e8 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mark Brown
Browse files

ASoC: samsung: i2s: Define the parameters list for SAMSUNG_I2S_OPCLK 



The SAMSUNG_I2S_OPCLK is not currently used by any card driver thus we can
safely change semantics of 'dir' argument of the I2S set_sysclk() callback.
Now an enumeration is exported instead of directly using register bit field
values.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 48279c53

sound/soc/samsung/i2s-regs.h

+6 −5
Original line number Diff line number Diff line
@@ -65,11 +65,12 @@ 
#define CON_RXDMA_ACTIVE	(1 << 1)

#define CON_ACTIVE		(1 << 0)



#define MOD_OPCLK_CDCLK_OUT	(0 << 30)

#define MOD_OPCLK_CDCLK_IN	(1 << 30)

#define MOD_OPCLK_BCLK_OUT	(2 << 30)

#define MOD_OPCLK_PCLK		(3 << 30)

#define MOD_OPCLK_MASK		(3 << 30)

#define MOD_OPCLK_SHIFT		30

#define MOD_OPCLK_CDCLK_OUT	(0 << MOD_OPCLK_SHIFT)

#define MOD_OPCLK_CDCLK_IN	(1 << MOD_OPCLK_SHIFT)

#define MOD_OPCLK_BCLK_OUT	(2 << MOD_OPCLK_SHIFT)

#define MOD_OPCLK_PCLK		(3 << MOD_OPCLK_SHIFT)

#define MOD_OPCLK_MASK		(3 << MOD_OPCLK_SHIFT)

#define MOD_TXS_IDMA		(1 << 28) /* Sec_TXFIFO use I-DMA */



#define MOD_BLCS_SHIFT		26

sound/soc/samsung/i2s.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, 
	switch (clk_id) {

	case SAMSUNG_I2S_OPCLK:

		mask = MOD_OPCLK_MASK;

		val = dir;

		val = (dir << MOD_OPCLK_SHIFT) & MOD_OPCLK_MASK;

		break;

	case SAMSUNG_I2S_CDCLK:

		mask = 1 << i2s_regs->cdclkcon_off;

sound/soc/samsung/i2s.h

+8 −3
Original line number Diff line number Diff line
@@ -21,6 +21,11 @@ 
#define SAMSUNG_I2S_RCLKSRC_0		0

#define SAMSUNG_I2S_RCLKSRC_1		1

#define SAMSUNG_I2S_CDCLK		2

/* Operation clock for IIS logic */

#define SAMSUNG_I2S_OPCLK		3

#define  SAMSUNG_I2S_OPCLK_CDCLK_OUT	0	/* CODEC clock out */

#define  SAMSUNG_I2S_OPCLK_CDCLK_IN	1	/* CODEC clock in */

#define  SAMSUNG_I2S_OPCLK_BCLK_OUT	2	/* Bit clock out */

#define  SAMSUNG_I2S_OPCLK_PCLK		3	/* Audio bus clock */



#endif /* __SND_SOC_SAMSUNG_I2S_H */