ASoC: rt5677: Add the chip type to distinguish the setting of the clock source
Subsystems (3)
Oder Chiou
maintainerPATCH 1/1 ASoC: rt5677: Add the chip type to distinguish the setting of the clock source
There is only one clock source in the rt5676, so the chip type is added to distinguish the setting of the clock source in the VAD function.
Signed-off-by Oder Chiou <[email protected]>
--- sound/soc/codecs/rt5677.c | 23 +++++++++++++++++------ sound/soc/codecs/rt5677.h | 6 ++++++ 2 files changed, 23 insertions(+), 6 deletions(-)
sound/soc/codecs/rt5677.c +17 -6
@@ -718,11 +718,19 @@ static int rt5677_set_dsp_vad(struct snd_soc_codec *codec, bool on) RT5677_LDO1_SEL_MASK, 0x0);regmap_update_bits (rt5677->regmap,RT5677_PWR_ANLG2 ,RT5677_PWR_LDO1 ,RT5677_PWR_LDO1 ); -regmap_update_bits (rt5677->regmap,RT5677_GLB_CLK1 , -RT5677_MCLK_SRC_MASK ,RT5677_MCLK2_SRC ); -regmap_update_bits (rt5677->regmap,RT5677_GLB_CLK2 , -RT5677_PLL2_PR_SRC_MASK |RT5677_DSP_CLK_SRC_MASK , -RT5677_PLL2_PR_SRC_MCLK2 |RT5677_DSP_CLK_SRC_BYPASS ); +if (rt5677->type ==RT5677 ) { +regmap_update_bits (rt5677->regmap,RT5677_GLB_CLK1 , +RT5677_MCLK_SRC_MASK ,RT5677_MCLK2_SRC ); +regmap_update_bits (rt5677->regmap,RT5677_GLB_CLK2 , +RT5677_PLL2_PR_SRC_MASK | +RT5677_DSP_CLK_SRC_MASK , +RT5677_PLL2_PR_SRC_MCLK2 | +RT5677_DSP_CLK_SRC_BYPASS ); + }else { +regmap_update_bits (rt5677->regmap,RT5677_GLB_CLK2 , +RT5677_DSP_CLK_SRC_MASK , +RT5677_DSP_CLK_SRC_BYPASS ); + }regmap_write (rt5677->regmap,RT5677_PWR_DSP2 ,0x07ff );regmap_write (rt5677->regmap,RT5677_PWR_DSP1 ,0x07fd );rt5677_set_dsp_mode (codec, true);
@@ -4733,7 +4741,8 @@ static const struct regmap_config rt5677_regmap = { };static const struct i2c_device_id rt5677_i2c_id[] = { - {"rt5677" ,0 }, + {"rt5677" ,RT5677 }, + {"rt5676" ,RT5676 }, { } };MODULE_DEVICE_TABLE (i2c, rt5677_i2c_id);
@@ -4850,6 +4859,8 @@ static int rt5677_i2c_probe(struct i2c_client *i2c,i2c_set_clientdata (i2c, rt5677); + rt5677->type = id->driver_data; +if (pdata) rt5677->pdata = *pdata;
sound/soc/codecs/rt5677.h +6 -0
@@ -1665,6 +1665,11 @@ enum { RT5677_IRQ_JD3, }; +enum rt5677_type { +RT5677 , +RT5676 , +}; +struct rt5677_priv {struct snd_soc_codec *codec;struct rt5677_platform_data pdata;
@@ -1681,6 +1686,7 @@ struct rt5677_priv {int pll_in;int pll_out;int pow_ldo2;/* POW_LDO2 pin */ +enum rt5677_type type;#ifdef CONFIG_GPIOLIB struct gpio_chip gpio_chip;#endif
Signature · 1 line
1.8.1.1.439.g50a6b54
Mark Brown
maintainersound/soc/codecs/rt5677.c static int rt5677_set_dsp_vad(struct snd_soc_codec *codec, bool on) · line 733
Quoted 13 lines · Oder Chiou
sound/soc/codecs/rt5677.c +13
-0+if (rt5677->type ==RT5677 ) { +regmap_update_bits (rt5677->regmap,RT5677_GLB_CLK1 , +RT5677_MCLK_SRC_MASK ,RT5677_MCLK2_SRC ); +regmap_update_bits (rt5677->regmap,RT5677_GLB_CLK2 , +RT5677_PLL2_PR_SRC_MASK | +RT5677_DSP_CLK_SRC_MASK , +RT5677_PLL2_PR_SRC_MCLK2 | +RT5677_DSP_CLK_SRC_BYPASS ); + }else { +regmap_update_bits (rt5677->regmap,RT5677_GLB_CLK2 , +RT5677_DSP_CLK_SRC_MASK , +RT5677_DSP_CLK_SRC_BYPASS ); + }
This change looks good except for the above which is better written as a switch statement - it's best to write choices between chip types like that so that if a new variant comes up then it's easy to slot in.