Skip to content

Commit 5f886d7

Browse files
committed
Merge series "ASoC: codecs: add MAX98373 Soundwire driver" from Pierre-Louis Bossart <[email protected]>:
V2 with a number of cleanups: split between I2C and SoundWire modes, as done for rt5682, and updated Kconfigs. removed useless initializations common to both modes removed idle_bias on fixed register classified as volatile in error fixed SPDX comments Pierre-Louis Bossart (2): ASoC: codecs: max98373: split I2C and common parts ASoC: Intel: sof-sdw: add MAX98373 I2C dependencies Ryan Lee (2): ASoC: codecs: max98373: Removed superfluous volume control from chip default ASoC: codecs: max98373: add SoundWire support randerwang (2): ASoc: codecs: max98373: remove Idle_bias_on to let codec suspend ASoC: Intel: sdw_max98373: add card_late_probe support sound/soc/codecs/Kconfig | 20 +- sound/soc/codecs/Makefile | 4 + sound/soc/codecs/max98373-i2c.c | 612 +++++++++++++++ sound/soc/codecs/max98373-sdw.c | 887 ++++++++++++++++++++++ sound/soc/codecs/max98373-sdw.h | 72 ++ sound/soc/codecs/max98373.c | 619 +-------------- sound/soc/codecs/max98373.h | 17 +- sound/soc/intel/boards/Kconfig | 7 +- sound/soc/intel/boards/sof_sdw.c | 19 +- sound/soc/intel/boards/sof_sdw_common.h | 6 + sound/soc/intel/boards/sof_sdw_max98373.c | 12 + 11 files changed, 1668 insertions(+), 607 deletions(-) create mode 100644 sound/soc/codecs/max98373-i2c.c create mode 100644 sound/soc/codecs/max98373-sdw.c create mode 100644 sound/soc/codecs/max98373-sdw.h base-commit: a5911ac -- 2.25.1
2 parents eceb543 + 0fd3935 commit 5f886d7

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

sound/soc/codecs/max98373.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -779,13 +779,6 @@ static int max98373_probe(struct snd_soc_component *component)
779779
regmap_write(max98373->regmap,
780780
MAX98373_R202A_PCM_TO_SPK_MONO_MIX_2,
781781
0x1);
782-
/* Set inital volume (0dB) */
783-
regmap_write(max98373->regmap,
784-
MAX98373_R203D_AMP_DIG_VOL_CTRL,
785-
0x00);
786-
regmap_write(max98373->regmap,
787-
MAX98373_R203E_AMP_PATH_GAIN,
788-
0x00);
789782
/* Enable DC blocker */
790783
regmap_write(max98373->regmap,
791784
MAX98373_R203F_AMP_DSP_CFG,
@@ -869,7 +862,6 @@ static const struct snd_soc_component_driver soc_codec_dev_max98373 = {
869862
.num_dapm_widgets = ARRAY_SIZE(max98373_dapm_widgets),
870863
.dapm_routes = max98373_audio_map,
871864
.num_dapm_routes = ARRAY_SIZE(max98373_audio_map),
872-
.idle_bias_on = 1,
873865
.use_pmdown_time = 1,
874866
.endianness = 1,
875867
.non_legacy_dai_naming = 1,

0 commit comments

Comments
 (0)