diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-07-15 16:29:07 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-07-15 16:29:07 +0400 |
commit | 1abfeb03a9ee05097aaa33a0f44984fc82131b7f (patch) | |
tree | 3b71f06e839f7470c1791c53e0a08afb18ca6698 /sound/soc/codecs/sgtl5000.c | |
parent | 4b8846062faac4e5c3f08e2e06bbb33c949aa51f (diff) | |
parent | 4824b69a928b6609cfb1cf232ef32d4a8125a371 (diff) | |
download | linux-1abfeb03a9ee05097aaa33a0f44984fc82131b7f.tar.xz |
Merge tag 'asoc-v3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.11
The biggest change here is the OMAP change, these are larger than I'd
have liked but make the driver actually usable - during the merge window
OMAP removed support for non-DT OMAP4 boards but in doing so removed the
method of accessing DMA channels used by the ASoC drivers rendering them
unusuable.
Otherwise nothing exciting, the symmetric rates change for WM8978 is a
fix for the information we expose to userspace.
Diffstat (limited to 'sound/soc/codecs/sgtl5000.c')
-rw-r--r-- | sound/soc/codecs/sgtl5000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index d441559dc92c..d659d3adcfb3 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -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 }, |