drm/i2c: tda998x: use global constants
Subsystems (2)
PATCH v2 21/28 drm/i2c: tda998x: use global constants
Signed-off-by Jean-Francois Moine <[email protected]>
--- drivers/gpu/drm/i2c/tda998x_drv.c | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/gpu/drm/i2c/tda998x_drv.c +14 -9
@@ -132,6 +132,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)
@@ -212,7 +214,12 @@ struct tda998x_priv {# 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 SEL_AIP_SPDIF 0 +#define SEL_AIP_I2S 1 +#define CLKPOLDSD_ACLK 0/* same pol as ACLK */ +#define CLKPOLDSD_NACLK 1/* inverted */ +#define CTSREF_ACLK 0/* I2S */ +#define CTSREF_FS64SPDIF 2/* spdif */ /* Page 02h: PLL settings */ #define REG_PLL_SERIAL_1 REG(0x02, 0x00)/* read/write */
@@ -721,19 +728,17 @@ tda998x_configure_audio(struct tda998x_priv *priv,/* Set audio input source */ switch (priv->audio_type) {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 (SEL_AIP_SPDIF ); + clksel_fs =AIP_CLKSEL_FS (CTSREF_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 (SEL_AIP_I2S ); + clksel_fs =AIP_CLKSEL_FS (CTSREF_ACLK ); cts_n =CTS_N_M (3 ) |CTS_N_K (3 ); ca_i2s =CA_I2S_CA_I2S (0 );break ;
Signature · 2 lines
Ken ar c'henta? | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/
Quoted 20 lines · Jean-Francois Moine
Signed-off-by Jean-Francois Moine <[email protected]>--- drivers/gpu/drm/i2c/tda998x_drv.c | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)drivers/gpu/drm/i2c/tda998x_drv.c +2
-0@@ -132,6 +132,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)
drivers/gpu/drm/i2c/tda998x_drv.c struct tda998x_priv { · line 218
Quoted 6 lines
drivers/gpu/drm/i2c/tda998x_drv.c +2
-1@@ -212,7 +214,12 @@ struct tda998x_priv {# 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 SEL_AIP_SPDIF 0 +#define SEL_AIP_I2S 1
I'd much rather these became:
# define AIP_CLKSEL_AIP_SPDIF (0 << 3) # define AIP_CLKSEL_AIP_I2S (1 << 3)
and kill AIP_CLKSEL_AIP().
drivers/gpu/drm/i2c/tda998x_drv.c struct tda998x_priv { · line 220
Quoted 2 lines
drivers/gpu/drm/i2c/tda998x_drv.c +2
-0+#define CLKPOLDSD_ACLK 0/* same pol as ACLK */ +#define CLKPOLDSD_NACLK 1/* inverted */
If this is for AIP_CLKSEL_CLK_POL, this is labelled up in the data I have as "for internal use" - we should probably remove AIP_CLKSEL_CLK_POL() from the above definitions.
drivers/gpu/drm/i2c/tda998x_drv.c struct tda998x_priv { · line 222
Quoted 2 lines
drivers/gpu/drm/i2c/tda998x_drv.c +2
-0+#define CTSREF_ACLK 0/* I2S */ +#define CTSREF_FS64SPDIF 2/* spdif */
Again, better to define these as:
# define AIP_CLKSEL_FS_ACLK (0 << 0) # define AIP_CLKSEL_FS_MCLK (1 << 0) # define AIP_CLKSEL_FS_FS64SPDIF (2 << 0)
and kill AIP_CLKSEL_FS().
Signature · 3 lines
FTTC broadband for 0.8mile line: 5.8Mbps down 500kbps up. Estimation in database were 13.1 to 19Mbit for a good line, about 7.5+ for a bad. Estimate before purchase was "up to 13.2Mbit".