sound/sgtl5000: fix codec register initial values and mask
Subsystems (3)
PATCH 1/1 sound/sgtl5000: fix codec register initial values and mask
According to documentation bit 3:2 in register SSS_CTRL are reserved and zero, so initially setting the register to 0x0008 does not make much sense. Instead, bit 4 should be marked set, as this is the power up default.
Further, mask computation in declarative part is obviously wrong:
Fix FRAC DIVISOR to provide an 11 bit mask correctly.
--- sound/soc/codecs/sgtl5000.c | 2 +- sound/soc/codecs/sgtl5000.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/sgtl5000.c +1 -1
@@ -37,7 +37,7 @@static const u16 sgtl5000_regs[SGTL5000_MAX_REG_OFFSET ] = { [SGTL5000_CHIP_CLK_CTRL ] =0x0008 , [SGTL5000_CHIP_I2S_CTRL ] =0x0010 , - [SGTL5000_CHIP_SSS_CTRL ] =0x0008 , + [SGTL5000_CHIP_SSS_CTRL ] =0x0010 , [SGTL5000_CHIP_DAC_VOL ] =0x3c3c , [SGTL5000_CHIP_PAD_STRENGTH ] =0x015f , [SGTL5000_CHIP_ANA_HP_CTRL ] =0x1818 ,
sound/soc/codecs/sgtl5000.h +1 -1
@@ -347,7 +347,7 @@#define SGTL5000_PLL_INT_DIV_MASK 0xf800#define SGTL5000_PLL_INT_DIV_SHIFT 11#define SGTL5000_PLL_INT_DIV_WIDTH 5 -#define SGTL5000_PLL_FRAC_DIV_MASK 0x0700 +#define SGTL5000_PLL_FRAC_DIV_MASK 0x07ff#define SGTL5000_PLL_FRAC_DIV_SHIFT 0#define SGTL5000_PLL_FRAC_DIV_WIDTH 11
Signature · 1 line
1.7.9.5
Hi Oskar,
Quoted 9 lines · Oskar Schirmer
According to documentation bit 3:2 in register
SSS_CTRLare reserved and zero, so initially setting the register to0x0008does not make much sense. Instead, bit 4 should be marked set, as this is the power up default.Further, mask computation in declarative part is obviously wrong:
Fix FRAC DIVISOR to provide an 11 bit mask correctly.Signed-off-by Oskar Schirmer <[email protected]>
Please rebase your patch against Mark Brown's topic/sgtl5000 branch:
https://git.kernel.org/cgit/linux/kernel/git/broonie/sound.git/log/?h=topic/sgtl5000
After that, you can add my:
PATCH v2 1/1 sound/sgtl5000: fix codec register initial values and mask
According to documentation bit 3:2 in register SSS_CTRL are reserved and zero, so initially setting the register to 0x0008 does not make much sense. Instead, bit 4 should be marked set, as this is the power up default.
Further, mask computation in declarative part is obviously wrong:
Fix FRAC DIVISOR to provide an 11 bit mask correctly.
--- sound/soc/codecs/sgtl5000.c | 2 +- sound/soc/codecs/sgtl5000.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/sgtl5000.c +1 -1
@@ -38,7 +38,7 @@static const struct reg_default sgtl5000_reg_defaults[] = { {SGTL5000_CHIP_CLK_CTRL ,0x0008 }, {SGTL5000_CHIP_I2S_CTRL ,0x0010 }, - {SGTL5000_CHIP_SSS_CTRL ,0x0008 }, + {SGTL5000_CHIP_SSS_CTRL ,0x0010 }, {SGTL5000_CHIP_DAC_VOL ,0x3c3c }, {SGTL5000_CHIP_PAD_STRENGTH ,0x015f }, {SGTL5000_CHIP_ANA_HP_CTRL ,0x1818 },
sound/soc/codecs/sgtl5000.h +1 -1
@@ -347,7 +347,7 @@#define SGTL5000_PLL_INT_DIV_MASK 0xf800#define SGTL5000_PLL_INT_DIV_SHIFT 11#define SGTL5000_PLL_INT_DIV_WIDTH 5 -#define SGTL5000_PLL_FRAC_DIV_MASK 0x0700 +#define SGTL5000_PLL_FRAC_DIV_MASK 0x07ff#define SGTL5000_PLL_FRAC_DIV_SHIFT 0#define SGTL5000_PLL_FRAC_DIV_WIDTH 11
Signature · 1 line
1.7.9.5
Quoted 10 lines · Oskar Schirmer
According to documentation bit 3:2 in register
SSS_CTRLare reserved and zero, so initially setting the register to0x0008does not make much sense. Instead, bit 4 should be marked set, as this is the power up default.Further, mask computation in declarative part is obviously wrong:
Fix FRAC DIVISOR to provide an 11 bit mask correctly.Signed-off-by Oskar Schirmer <[email protected]>Tested-by Fabio Estevam <[email protected]>
Looks good, but please copy Mark Brown. Just added him in Cc now.
Quoted 32 lines
--- sound/soc/codecs/sgtl5000.c | 2 +- sound/soc/codecs/sgtl5000.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)sound/soc/codecs/sgtl5000.c +1
-1@@ -38,7 +38,7 @@static const struct reg_default sgtl5000_reg_defaults[] = { {SGTL5000_CHIP_CLK_CTRL ,0x0008 }, {SGTL5000_CHIP_I2S_CTRL ,0x0010 }, - {SGTL5000_CHIP_SSS_CTRL ,0x0008 }, + {SGTL5000_CHIP_SSS_CTRL ,0x0010 }, {SGTL5000_CHIP_DAC_VOL ,0x3c3c }, {SGTL5000_CHIP_PAD_STRENGTH ,0x015f }, {SGTL5000_CHIP_ANA_HP_CTRL ,0x1818 },sound/soc/codecs/sgtl5000.h +1
-1@@ -347,7 +347,7 @@#define SGTL5000_PLL_INT_DIV_MASK 0xf800#define SGTL5000_PLL_INT_DIV_SHIFT 11#define SGTL5000_PLL_INT_DIV_WIDTH 5 -#define SGTL5000_PLL_FRAC_DIV_MASK 0x0700 +#define SGTL5000_PLL_FRAC_DIV_MASK 0x07ff#define SGTL5000_PLL_FRAC_DIV_SHIFT 0#define SGTL5000_PLL_FRAC_DIV_WIDTH 11
Mark Brown
maintainerQuoted 6 lines · Fabio Estevam
Quoted 5 lines · Oskar Schirmer
According to documentation bit 3:2 in register
SSS_CTRLare reserved and zero, so initially setting the register to0x0008does not make much sense. Instead, bit 4 should be marked set, as this is the power up default.
Quoted 7 lines
Quoted 5 lines
Further, mask computation in declarative part is obviously wrong:
Fix FRAC DIVISOR to provide an 11 bit mask correctly.Signed-off-by Oskar Schirmer <[email protected]>Tested-by Fabio Estevam <[email protected]>Looks good, but please copy Mark Brown. Just added him in Cc now.
Please also use subject lines matching the normal style for the subsystem. I can't apply this unless someone sends me a copy properly (not quoted and so on).
PATCH v3 1/1 sound/sgtl5000: fix codec register initial values and handling
In reply to Fabio EstevamAccording to documentation bit 3:2 in register SSS_CTRL are reserved and zero, so initially setting the register to 0x0008 does not make much sense. Instead, bit 4 should be marked set, as this is the power up default.
Further, mask computation in declarative part is obviously wrong:
Fix FRAC DIVISOR to provide an 11 bit mask correctly.
Next, powering down PLL before switching to a mode that does not use it, is a bad idea. So first set the mode control, then power down PLL.
--- sound/soc/codecs/sgtl5000.c | 11 +++++++---- sound/soc/codecs/sgtl5000.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-)
sound/soc/codecs/sgtl5000.c +7 -4
@@ -38,7 +38,7 @@static const struct reg_default sgtl5000_reg_defaults[] = { {SGTL5000_CHIP_CLK_CTRL ,0x0008 }, {SGTL5000_CHIP_I2S_CTRL ,0x0010 }, - {SGTL5000_CHIP_SSS_CTRL ,0x0008 }, + {SGTL5000_CHIP_SSS_CTRL ,0x0010 }, {SGTL5000_CHIP_DAC_VOL ,0x3c3c }, {SGTL5000_CHIP_PAD_STRENGTH ,0x015f }, {SGTL5000_CHIP_ANA_HP_CTRL ,0x1818 },
@@ -644,16 +644,19 @@ static int sgtl5000_set_clock(struct snd_soc_codec *codec, int frame_rate)snd_soc_update_bits (codec,SGTL5000_CHIP_ANA_POWER ,SGTL5000_PLL_POWERUP |SGTL5000_VCOAMP_POWERUP ,SGTL5000_PLL_POWERUP |SGTL5000_VCOAMP_POWERUP ); + +/* if using pll, clk_ctrl must be set after pll power up */ +snd_soc_write (codec,SGTL5000_CHIP_CLK_CTRL , clk_ctl); }else { +/* otherwise, clk_ctrl must be set before pll power down */ +snd_soc_write (codec,SGTL5000_CHIP_CLK_CTRL , clk_ctl); +/* power down pll */ snd_soc_update_bits (codec,SGTL5000_CHIP_ANA_POWER ,SGTL5000_PLL_POWERUP |SGTL5000_VCOAMP_POWERUP ,0 ); } -/* if using pll, clk_ctrl must be set after pll power up */ -snd_soc_write (codec,SGTL5000_CHIP_CLK_CTRL , clk_ctl); -return 0 ; }
sound/soc/codecs/sgtl5000.h +1 -1
@@ -347,7 +347,7 @@#define SGTL5000_PLL_INT_DIV_MASK 0xf800#define SGTL5000_PLL_INT_DIV_SHIFT 11#define SGTL5000_PLL_INT_DIV_WIDTH 5 -#define SGTL5000_PLL_FRAC_DIV_MASK 0x0700 +#define SGTL5000_PLL_FRAC_DIV_MASK 0x07ff#define SGTL5000_PLL_FRAC_DIV_SHIFT 0#define SGTL5000_PLL_FRAC_DIV_WIDTH 11
Signature · 1 line
1.7.9.5
Mark Brown
maintainerRe: [PATCH v3] sound/sgtl5000: fix codec register initial values and handling
On Wed, Jun 19, 2013 at 01:16:06PM +0000, Oskar Schirmer wrote:
This is a set of three unrelated changes, they should be sent as three separate patches.
Quoted 2 lines
Further, mask computation in declarative part is obviously wrong:
Fix FRAC DIVISOR to provide an 11 bit mask correctly.
What makes you say that this is obviously wrong? It's not entirely clear.
sound/soc/codecs/sgtl5000.h line 350
Quoted 2 lines
sound/soc/codecs/sgtl5000.h +1
-1-#define SGTL5000_PLL_FRAC_DIV_MASK 0x0700 +#define SGTL5000_PLL_FRAC_DIV_MASK 0x07ff
Based on your changelog I was expecting a mask with only two bits set here?