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

Commit 10df1a95 authored by Jean-Francois Moine's avatar Jean-Francois Moine Committed by Russell King
Browse files

drm/i2c: tda998x: make the audio code more readable 



This patch adds a definition of the values of the MUX_AP register and
simplifies the macro's defining the fields of the AIP_CLKSEL register.
This makes the format specific audio init sequence more readable.

Tested-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 12473b7d

drivers/gpu/drm/i2c/tda998x_drv.c

+13 −12
Original line number Diff line number Diff line
@@ -127,6 +127,8 @@ struct tda998x_priv { 
# define VIP_CNTRL_5_CKCASE       (1 << 0)

# define VIP_CNTRL_5_SP_CNT(x)    (((x) & 3) << 1)

#define REG_MUX_AP                REG(0x00, 0x26)     /* read/write */

# define MUX_AP_SELECT_I2S	  0x64

# define MUX_AP_SELECT_SPDIF	  0x40

#define REG_MUX_VP_VIP_OUT        REG(0x00, 0x27)     /* read/write */

#define REG_MAT_CONTRL            REG(0x00, 0x80)     /* write */

# define MAT_CONTRL_MAT_SC(x)     (((x) & 3) << 0)
@@ -204,10 +206,11 @@ struct tda998x_priv { 
#define REG_I2S_FORMAT            REG(0x00, 0xfc)     /* read/write */

# define I2S_FORMAT(x)            (((x) & 3) << 0)

#define REG_AIP_CLKSEL            REG(0x00, 0xfd)     /* write */

# define AIP_CLKSEL_FS(x)         (((x) & 3) << 0)

# define AIP_CLKSEL_CLK_POL(x)    (((x) & 1) << 2)

# define AIP_CLKSEL_AIP(x)        (((x) & 7) << 3)



# define AIP_CLKSEL_AIP_SPDIF	  (0 << 3)

# define AIP_CLKSEL_AIP_I2S	  (1 << 3)

# define AIP_CLKSEL_FS_ACLK	  (0 << 0)

# define AIP_CLKSEL_FS_MCLK	  (1 << 0)

# define AIP_CLKSEL_FS_FS64SPDIF  (2 << 0)



/* Page 02h: PLL settings */

#define REG_PLL_SERIAL_1          REG(0x02, 0x00)     /* read/write */
@@ -647,19 +650,17 @@ tda998x_configure_audio(struct tda998x_priv *priv, 
	/* Set audio input source */

	switch (p->audio_format) {

	case AFMT_SPDIF:

		reg_write(priv, REG_MUX_AP, 0x40);

		clksel_aip = AIP_CLKSEL_AIP(0);

		/* FS64SPDIF */

		clksel_fs = AIP_CLKSEL_FS(2);

		reg_write(priv, REG_MUX_AP, MUX_AP_SELECT_SPDIF);

		clksel_aip = AIP_CLKSEL_AIP_SPDIF;

		clksel_fs = AIP_CLKSEL_FS_FS64SPDIF;

		cts_n = CTS_N_M(3) | CTS_N_K(3);

		ca_i2s = 0;

		break;



	case AFMT_I2S:

		reg_write(priv, REG_MUX_AP, 0x64);

		clksel_aip = AIP_CLKSEL_AIP(1);

		/* ACLK */

		clksel_fs = AIP_CLKSEL_FS(0);

		reg_write(priv, REG_MUX_AP, MUX_AP_SELECT_I2S);

		clksel_aip = AIP_CLKSEL_AIP_I2S;

		clksel_fs = AIP_CLKSEL_FS_ACLK;

		cts_n = CTS_N_M(3) | CTS_N_K(3);

		ca_i2s = CA_I2S_CA_I2S(0);

		break;