Commit d7ee0c72 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown

ASoC: codecs: max98373: split I2C and common parts

To prepare support for SoundWire, let's first split the I2C and common
parts. No new functionality, just indents and formatting to make
checkpatch happy.
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200708203215.231776-2-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6940701c
...@@ -115,7 +115,7 @@ config SND_SOC_ALL_CODECS ...@@ -115,7 +115,7 @@ config SND_SOC_ALL_CODECS
imply SND_SOC_MAX98925 imply SND_SOC_MAX98925
imply SND_SOC_MAX98926 imply SND_SOC_MAX98926
imply SND_SOC_MAX98927 imply SND_SOC_MAX98927
imply SND_SOC_MAX98373 imply SND_SOC_MAX98373_I2C
imply SND_SOC_MAX98390 imply SND_SOC_MAX98390
imply SND_SOC_MAX9850 imply SND_SOC_MAX9850
imply SND_SOC_MAX9860 imply SND_SOC_MAX9860
...@@ -868,8 +868,12 @@ config SND_SOC_MAX98927 ...@@ -868,8 +868,12 @@ config SND_SOC_MAX98927
depends on I2C depends on I2C
config SND_SOC_MAX98373 config SND_SOC_MAX98373
tristate
config SND_SOC_MAX98373_I2C
tristate "Maxim Integrated MAX98373 Speaker Amplifier" tristate "Maxim Integrated MAX98373 Speaker Amplifier"
depends on I2C depends on I2C
select SND_SOC_MAX98373
config SND_SOC_MAX98390 config SND_SOC_MAX98390
tristate "Maxim Integrated MAX98390 Speaker Amplifier" tristate "Maxim Integrated MAX98390 Speaker Amplifier"
......
...@@ -115,6 +115,7 @@ snd-soc-max98925-objs := max98925.o ...@@ -115,6 +115,7 @@ snd-soc-max98925-objs := max98925.o
snd-soc-max98926-objs := max98926.o snd-soc-max98926-objs := max98926.o
snd-soc-max98927-objs := max98927.o snd-soc-max98927-objs := max98927.o
snd-soc-max98373-objs := max98373.o snd-soc-max98373-objs := max98373.o
snd-soc-max98373-i2c-objs := max98373-i2c.o
snd-soc-max98390-objs := max98390.o snd-soc-max98390-objs := max98390.o
snd-soc-max9850-objs := max9850.o snd-soc-max9850-objs := max9850.o
snd-soc-max9860-objs := max9860.o snd-soc-max9860-objs := max9860.o
...@@ -418,6 +419,7 @@ obj-$(CONFIG_SND_SOC_MAX98925) += snd-soc-max98925.o ...@@ -418,6 +419,7 @@ obj-$(CONFIG_SND_SOC_MAX98925) += snd-soc-max98925.o
obj-$(CONFIG_SND_SOC_MAX98926) += snd-soc-max98926.o obj-$(CONFIG_SND_SOC_MAX98926) += snd-soc-max98926.o
obj-$(CONFIG_SND_SOC_MAX98927) += snd-soc-max98927.o obj-$(CONFIG_SND_SOC_MAX98927) += snd-soc-max98927.o
obj-$(CONFIG_SND_SOC_MAX98373) += snd-soc-max98373.o obj-$(CONFIG_SND_SOC_MAX98373) += snd-soc-max98373.o
obj-$(CONFIG_SND_SOC_MAX98373_I2C) += snd-soc-max98373-i2c.o
obj-$(CONFIG_SND_SOC_MAX98390) += snd-soc-max98390.o obj-$(CONFIG_SND_SOC_MAX98390) += snd-soc-max98390.o
obj-$(CONFIG_SND_SOC_MAX9850) += snd-soc-max9850.o obj-$(CONFIG_SND_SOC_MAX9850) += snd-soc-max9850.o
obj-$(CONFIG_SND_SOC_MAX9860) += snd-soc-max9860.o obj-$(CONFIG_SND_SOC_MAX9860) += snd-soc-max9860.o
......
This diff is collapsed.
This diff is collapsed.
// SPDX-License-Identifier: GPL-2.0 /* SPDX-License-Identifier: GPL-2.0-only */
// Copyright (c) 2017, Maxim Integrated /* Copyright (c) 2017 Maxim Integrated */
#ifndef _MAX98373_H #ifndef _MAX98373_H
#define _MAX98373_H #define _MAX98373_H
...@@ -213,4 +213,10 @@ struct max98373_priv { ...@@ -213,4 +213,10 @@ struct max98373_priv {
unsigned int ch_size; unsigned int ch_size;
bool tdm_mode; bool tdm_mode;
}; };
extern const struct snd_soc_component_driver soc_codec_dev_max98373;
void max98373_reset(struct max98373_priv *max98373, struct device *dev);
void max98373_slot_config(struct device *dev,
struct max98373_priv *max98373);
#endif #endif
...@@ -390,7 +390,7 @@ config SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH ...@@ -390,7 +390,7 @@ config SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH
depends on MFD_INTEL_LPSS || COMPILE_TEST depends on MFD_INTEL_LPSS || COMPILE_TEST
select SND_SOC_DA7219 select SND_SOC_DA7219
select SND_SOC_MAX98927 select SND_SOC_MAX98927
select SND_SOC_MAX98373 select SND_SOC_MAX98373_I2C
select SND_SOC_DMIC select SND_SOC_DMIC
select SND_SOC_HDAC_HDMI select SND_SOC_HDAC_HDMI
help help
...@@ -467,7 +467,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH ...@@ -467,7 +467,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH
depends on ((SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC) &&\ depends on ((SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC) &&\
(MFD_INTEL_LPSS || COMPILE_TEST)) ||\ (MFD_INTEL_LPSS || COMPILE_TEST)) ||\
(SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST)) (SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST))
select SND_SOC_MAX98373 select SND_SOC_MAX98373_I2C
select SND_SOC_RT1015 select SND_SOC_RT1015
select SND_SOC_RT5682_I2C select SND_SOC_RT5682_I2C
select SND_SOC_DMIC select SND_SOC_DMIC
...@@ -531,7 +531,7 @@ config SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH ...@@ -531,7 +531,7 @@ config SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH
depends on MFD_INTEL_LPSS || COMPILE_TEST depends on MFD_INTEL_LPSS || COMPILE_TEST
depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
select SND_SOC_DA7219 select SND_SOC_DA7219
select SND_SOC_MAX98373 select SND_SOC_MAX98373_I2C
select SND_SOC_DMIC select SND_SOC_DMIC
help help
This adds support for ASoC machine driver for SOF platforms This adds support for ASoC machine driver for SOF platforms
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment