diff options
| author | Mark Brown <broonie@kernel.org> | 2020-07-17 01:51:51 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-07-17 01:51:51 +0300 |
| commit | bdd0c277d9846977ec3f175341d4e7475ed26ef7 (patch) | |
| tree | 5db1d90fde9a0a7131b5ad2cea88b0ed209df3bd /include/sound | |
| parent | d235b282369813c53fdd512d61402b6a7cda1603 (diff) | |
| parent | 50891431aaadf784980f8649d676327928bce72f (diff) | |
| download | linux-bdd0c277d9846977ec3f175341d4e7475ed26ef7.tar.xz | |
Merge series "ASoC: merge .digital_mute() into .mute_stream()" from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:
Hi Mark
These are v3 patch-set.
ALSA SoC has 2 mute callbacks (= .digital_mute(), .mute_stream()).
But the difference between these 2 are very small.
.digital_mute() is for Playback
.mute_stream() is for Playback/Capture
This patch-set adds new .no_capture_mute flag and emulate
.digital_mute() by .mute_stream().
v2 -> v3
- uses "xxx_mute_stream" for .mute_stream naming
if it was better
- removed verbose Cc email address
v1 -> v2
- return -ENOTSUPP at hdmi-codec
- add new .no_capture_mute flag and emulate .digital_mute()
by .mute_stream()
Link: https://lore.kernel.org/r/874kqy2y5t.wl-kuninori.morimoto.gx@renesas.com
Link: https://lore.kernel.org/r/87ftam37ko.wl-kuninori.morimoto.gx@renesas.com
Kuninori Morimoto (21):
ASoC: hdmi-codec: return -ENOTSUPP for digital_mute
ASoC: soc-dai.c: add .no_capture_mute support
ASoC: hdmi-codec: merge .digital_mute() into .mute_stream()
ASoC: ti: merge .digital_mute() into .mute_stream()
ASoC: spear: merge .digital_mute() into .mute_stream()
ASoC: meson: merge .digital_mute() into .mute_stream()
ASoC: atmel: merge .digital_mute() into .mute_stream()
ASoC: codecs: merge .digital_mute() into .mute_stream()
ASoC: codecs: tlv*: merge .digital_mute() into .mute_stream()
ASoC: codecs: tas*: merge .digital_mute() into .mute_stream()
ASoC: codecs: ssm*: merge .digital_mute() into .mute_stream()
ASoC: codecs: pcm*: merge .digital_mute() into .mute_stream()
ASoC: codecs: max*: merge .digital_mute() into .mute_stream()
ASoC: codecs: alc*: merge .digital_mute() into .mute_stream()
ASoC: codecs: wm*: merge .digital_mute() into .mute_stream()
ASoC: codecs: es*: merge .digital_mute() into .mute_stream()
ASoC: codecs: da*: merge .digital_mute() into .mute_stream()
ASoC: codecs: cs*: merge .digital_mute() into .mute_stream()
ASoC: codecs: ak*: merge .digital_mute() into .mute_stream()
ASoC: soc-dai: remove .digital_mute
ASoC: soc-core: snd_soc_dai_digital_mute() for both CPU/Codec
drivers/gpu/drm/bridge/sii902x.c | 7 ++++---
drivers/gpu/drm/exynos/exynos_hdmi.c | 6 ++++--
drivers/gpu/drm/i2c/tda998x_drv.c | 7 ++++---
drivers/gpu/drm/mediatek/mtk_hdmi.c | 6 ++++--
drivers/gpu/drm/rockchip/cdn-dp-core.c | 7 ++++---
drivers/gpu/drm/sti/sti_hdmi.c | 6 ++++--
drivers/gpu/drm/zte/zx_hdmi.c | 7 ++++---
include/sound/hdmi-codec.h | 6 +++++-
include/sound/soc-dai.h | 4 +++-
sound/soc/atmel/atmel-classd.c | 7 ++++---
sound/soc/codecs/88pm860x-codec.c | 8 +++++---
sound/soc/codecs/ad193x.c | 5 +++--
sound/soc/codecs/adau1701.c | 5 +++--
sound/soc/codecs/ak4458.c | 5 +++--
sound/soc/codecs/ak4535.c | 6 ++++--
sound/soc/codecs/ak4641.c | 8 +++++---
sound/soc/codecs/alc5623.c | 5 +++--
sound/soc/codecs/alc5632.c | 5 +++--
sound/soc/codecs/cpcap.c | 11 +++++++----
sound/soc/codecs/cq93vc.c | 5 +++--
sound/soc/codecs/cs4265.c | 5 +++--
sound/soc/codecs/cs4270.c | 5 +++--
sound/soc/codecs/cs42l42.c | 5 +++--
sound/soc/codecs/cs42l51.c | 5 +++--
sound/soc/codecs/cs42l52.c | 5 +++--
sound/soc/codecs/cs42l56.c | 5 +++--
sound/soc/codecs/cs42xx8.c | 5 +++--
sound/soc/codecs/cs4341.c | 5 +++--
sound/soc/codecs/cs4349.c | 5 +++--
sound/soc/codecs/da7210.c | 5 +++--
sound/soc/codecs/da7213.c | 5 +++--
sound/soc/codecs/da9055.c | 5 +++--
sound/soc/codecs/es8316.c | 5 +++--
sound/soc/codecs/es8328.c | 5 +++--
sound/soc/codecs/hdmi-codec.c | 25 +++++++++++++++++--------
sound/soc/codecs/isabelle.c | 15 +++++++++------
sound/soc/codecs/jz4770.c | 5 +++--
sound/soc/codecs/lm49453.c | 25 +++++++++++++++----------
sound/soc/codecs/max98088.c | 12 ++++++++----
sound/soc/codecs/max98090.c | 6 ++++--
sound/soc/codecs/max9867.c | 5 +++--
sound/soc/codecs/ml26124.c | 5 +++--
sound/soc/codecs/nau8822.c | 5 +++--
sound/soc/codecs/pcm1681.c | 5 +++--
sound/soc/codecs/pcm1789.c | 5 +++--
sound/soc/codecs/pcm179x.c | 5 +++--
sound/soc/codecs/pcm3168a.c | 5 +++--
sound/soc/codecs/pcm512x.c | 5 +++--
sound/soc/codecs/rk3328_codec.c | 5 +++--
sound/soc/codecs/sgtl5000.c | 5 +++--
sound/soc/codecs/ssm2518.c | 5 +++--
sound/soc/codecs/ssm2602.c | 5 +++--
sound/soc/codecs/ssm4567.c | 5 +++--
sound/soc/codecs/sta529.c | 5 +++--
sound/soc/codecs/tas2552.c | 5 +++--
sound/soc/codecs/tas2562.c | 5 +++--
sound/soc/codecs/tas2770.c | 5 +++--
sound/soc/codecs/tas571x.c | 5 +++--
sound/soc/codecs/tas5720.c | 5 +++--
sound/soc/codecs/tas6424.c | 5 +++--
sound/soc/codecs/tfa9879.c | 5 +++--
sound/soc/codecs/tlv320aic23.c | 5 +++--
sound/soc/codecs/tlv320aic26.c | 5 +++--
sound/soc/codecs/tlv320aic31xx.c | 6 ++++--
sound/soc/codecs/tlv320aic32x4.c | 5 +++--
sound/soc/codecs/tlv320aic3x.c | 5 +++--
sound/soc/codecs/twl6040.c | 5 +++--
sound/soc/codecs/uda134x.c | 5 +++--
sound/soc/codecs/wm8350.c | 5 +++--
sound/soc/codecs/wm8400.c | 5 +++--
sound/soc/codecs/wm8510.c | 5 +++--
sound/soc/codecs/wm8580.c | 5 +++--
sound/soc/codecs/wm8711.c | 5 +++--
sound/soc/codecs/wm8728.c | 5 +++--
sound/soc/codecs/wm8731.c | 5 +++--
sound/soc/codecs/wm8741.c | 5 +++--
sound/soc/codecs/wm8750.c | 5 +++--
sound/soc/codecs/wm8753.c | 8 +++++---
sound/soc/codecs/wm8770.c | 5 +++--
sound/soc/codecs/wm8776.c | 5 +++--
sound/soc/codecs/wm8900.c | 5 +++--
sound/soc/codecs/wm8903.c | 5 +++--
sound/soc/codecs/wm8904.c | 5 +++--
sound/soc/codecs/wm8940.c | 5 +++--
sound/soc/codecs/wm8955.c | 5 +++--
sound/soc/codecs/wm8960.c | 5 +++--
sound/soc/codecs/wm8961.c | 5 +++--
sound/soc/codecs/wm8962.c | 5 +++--
sound/soc/codecs/wm8971.c | 5 +++--
sound/soc/codecs/wm8974.c | 5 +++--
sound/soc/codecs/wm8978.c | 5 +++--
sound/soc/codecs/wm8983.c | 7 ++++---
sound/soc/codecs/wm8985.c | 7 ++++---
sound/soc/codecs/wm8988.c | 5 +++--
sound/soc/codecs/wm8990.c | 5 +++--
sound/soc/codecs/wm8991.c | 7 ++++---
sound/soc/codecs/wm8993.c | 5 +++--
sound/soc/codecs/wm8994.c | 9 ++++++---
sound/soc/codecs/wm8995.c | 8 +++++---
sound/soc/codecs/wm9081.c | 5 +++--
sound/soc/meson/axg-spdifout.c | 5 +++--
sound/soc/soc-core.c | 4 ++--
sound/soc/soc-dai.c | 12 +++++++-----
sound/soc/spear/spdif_out.c | 8 +++++---
sound/soc/ti/ams-delta.c | 9 +++++----
105 files changed, 390 insertions(+), 249 deletions(-)
--
2.25.1
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/hdmi-codec.h | 6 | ||||
| -rw-r--r-- | include/sound/soc-dai.h | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/sound/hdmi-codec.h b/include/sound/hdmi-codec.h index 83b17682e01c..17eebd34835a 100644 --- a/include/sound/hdmi-codec.h +++ b/include/sound/hdmi-codec.h @@ -76,7 +76,8 @@ struct hdmi_codec_ops { * Mute/unmute HDMI audio stream. * Optional */ - int (*digital_mute)(struct device *dev, void *data, bool enable); + int (*mute_stream)(struct device *dev, void *data, + bool enable, int direction); /* * Provides EDID-Like-Data from connected HDMI device. @@ -99,6 +100,9 @@ struct hdmi_codec_ops { int (*hook_plugged_cb)(struct device *dev, void *data, hdmi_codec_plugged_cb fn, struct device *codec_dev); + + /* bit field */ + unsigned int no_capture_mute:1; }; /* HDMI codec initalization data */ diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 212257e84fac..e0e061b8e9bd 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -280,6 +280,9 @@ struct snd_soc_dai_ops { */ snd_pcm_sframes_t (*delay)(struct snd_pcm_substream *, struct snd_soc_dai *); + + /* bit field */ + unsigned int no_capture_mute:1; }; struct snd_soc_cdai_ops { |