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

Commit b87b26ae authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/sgtl5000' into asoc-linus

parents 441c93ed 5c78dfe8

sound/soc/codecs/sgtl5000.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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