diff options
author | Mark Brown <broonie@kernel.org> | 2020-07-20 17:34:31 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-07-20 17:34:31 +0300 |
commit | 4d9e07cc41b837146ef39d99c8dad2a58326ae4a (patch) | |
tree | 7dcbad9704e8c7211ef5fc444f168c31e75bc702 /sound/soc/codecs/max98373.c | |
parent | fc926a7c818c97e98c5c2db1cb910523df0419e5 (diff) | |
parent | 58ef60025a1263e78de01b135d05784996383611 (diff) | |
download | linux-4d9e07cc41b837146ef39d99c8dad2a58326ae4a.tar.xz |
Merge series "ASoC: Intel: machine driver updates for 5.9" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
Small patchset to harden the SoundWire machine driver, change bad
HIDs, update PLL settings and avoid memory leaks. Given that the
SoundWire core parts are not upstream it's probably not necessary to
provide the patches to stable branches.
Bard Liao (1):
ASoC: Intel: sof_sdw_rt711: remove hard-coded codec name
Kai Vehmanen (2):
ASoC: Intel: sof_sdw: add support for systems without i915 audio
ASoC: Intel: sof_sdw: avoid crash if invalid DSP topology loaded
Libin Yang (1):
ASoC: Intel: common: change match table ehl-rt5660
Pierre-Louis Bossart (1):
ASoC: Intel: sof_sdw_rt711: remove properties in card remove
Yong Zhi (1):
ASoC: intel: board: sof_rt5682: Update rt1015 pll input clk freq
sound/soc/intel/boards/sof_rt5682.c | 9 +++++-
sound/soc/intel/boards/sof_sdw.c | 31 +++++++++++++------
sound/soc/intel/boards/sof_sdw_common.h | 2 ++
sound/soc/intel/boards/sof_sdw_hdmi.c | 6 ++++
sound/soc/intel/boards/sof_sdw_rt711.c | 17 +++++++++-
.../intel/common/soc-acpi-intel-ehl-match.c | 2 +-
6 files changed, 54 insertions(+), 13 deletions(-)
base-commit: 22e9b54307987787efa0ee534aa9e31982ec1161
--
2.25.1
Diffstat (limited to 'sound/soc/codecs/max98373.c')
-rw-r--r-- | sound/soc/codecs/max98373.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/soc/codecs/max98373.c b/sound/soc/codecs/max98373.c index 67b5faa64ec3..929bb1798c43 100644 --- a/sound/soc/codecs/max98373.c +++ b/sound/soc/codecs/max98373.c @@ -331,13 +331,6 @@ static int max98373_probe(struct snd_soc_component *component) regmap_write(max98373->regmap, MAX98373_R202A_PCM_TO_SPK_MONO_MIX_2, 0x1); - /* Set inital volume (0dB) */ - regmap_write(max98373->regmap, - MAX98373_R203D_AMP_DIG_VOL_CTRL, - 0x00); - regmap_write(max98373->regmap, - MAX98373_R203E_AMP_PATH_GAIN, - 0x00); /* Enable DC blocker */ regmap_write(max98373->regmap, MAX98373_R203F_AMP_DSP_CFG, @@ -397,7 +390,6 @@ const struct snd_soc_component_driver soc_codec_dev_max98373 = { .num_dapm_widgets = ARRAY_SIZE(max98373_dapm_widgets), .dapm_routes = max98373_audio_map, .num_dapm_routes = ARRAY_SIZE(max98373_audio_map), - .idle_bias_on = 1, .use_pmdown_time = 1, .endianness = 1, .non_legacy_dai_naming = 1, |