Unverified Commit bdd0c277 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: merge .digital_mute() into .mute_stream()" from Kuninori... 

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
parents d235b282 50891431

drivers/gpu/drm/bridge/sii902x.c

+4 −3
Original line number Diff line number Diff line
@@ -672,8 +672,8 @@ static void sii902x_audio_shutdown(struct device *dev, void *data) 
	clk_disable_unprepare(sii902x->audio.mclk);

}



static int sii902x_audio_digital_mute(struct device *dev,

				      void *data, bool enable)

static int sii902x_audio_mute(struct device *dev, void *data,

			      bool enable, int direction)

{

	struct sii902x *sii902x = dev_get_drvdata(dev);
@@ -724,9 +724,10 @@ static int sii902x_audio_get_dai_id(struct snd_soc_component *component, 
static const struct hdmi_codec_ops sii902x_audio_codec_ops = {

	.hw_params = sii902x_audio_hw_params,

	.audio_shutdown = sii902x_audio_shutdown,

	.digital_mute = sii902x_audio_digital_mute,

	.mute_stream = sii902x_audio_mute,

	.get_eld = sii902x_audio_get_eld,

	.get_dai_id = sii902x_audio_get_dai_id,

	.no_capture_mute = 1,

};



static int sii902x_audio_codec_init(struct sii902x *sii902x,

drivers/gpu/drm/exynos/exynos_hdmi.c

+4 −2
Original line number Diff line number Diff line
@@ -1604,7 +1604,8 @@ static int hdmi_audio_hw_params(struct device *dev, void *data, 
	return 0;

}



static int hdmi_audio_digital_mute(struct device *dev, void *data, bool mute)

static int hdmi_audio_mute(struct device *dev, void *data,

			   bool mute, int direction)

{

	struct hdmi_context *hdata = dev_get_drvdata(dev);
@@ -1634,8 +1635,9 @@ static int hdmi_audio_get_eld(struct device *dev, void *data, uint8_t *buf, 
static const struct hdmi_codec_ops audio_codec_ops = {

	.hw_params = hdmi_audio_hw_params,

	.audio_shutdown = hdmi_audio_shutdown,

	.digital_mute = hdmi_audio_digital_mute,

	.mute_stream = hdmi_audio_mute,

	.get_eld = hdmi_audio_get_eld,

	.no_capture_mute = 1,

};



static int hdmi_register_audio_device(struct hdmi_context *hdata)

drivers/gpu/drm/i2c/tda998x_drv.c

+4 −3
Original line number Diff line number Diff line
@@ -1133,8 +1133,8 @@ static void tda998x_audio_shutdown(struct device *dev, void *data) 
	mutex_unlock(&priv->audio_mutex);

}



static int tda998x_audio_digital_mute(struct device *dev, void *data,

				      bool enable)

static int tda998x_audio_mute_stream(struct device *dev, void *data,

				     bool enable, int direction)

{

	struct tda998x_priv *priv = dev_get_drvdata(dev);
@@ -1162,8 +1162,9 @@ static int tda998x_audio_get_eld(struct device *dev, void *data, 
static const struct hdmi_codec_ops audio_codec_ops = {

	.hw_params = tda998x_audio_hw_params,

	.audio_shutdown = tda998x_audio_shutdown,

	.digital_mute = tda998x_audio_digital_mute,

	.mute_stream = tda998x_audio_mute_stream,

	.get_eld = tda998x_audio_get_eld,

	.no_capture_mute = 1,

};



static int tda998x_audio_codec_init(struct tda998x_priv *priv,

drivers/gpu/drm/mediatek/mtk_hdmi.c

+4 −2
Original line number Diff line number Diff line
@@ -1647,7 +1647,8 @@ static void mtk_hdmi_audio_shutdown(struct device *dev, void *data) 
}



static int

mtk_hdmi_audio_digital_mute(struct device *dev, void *data, bool enable)

mtk_hdmi_audio_mute(struct device *dev, void *data,

		    bool enable, int direction)

{

	struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
@@ -1692,9 +1693,10 @@ static const struct hdmi_codec_ops mtk_hdmi_audio_codec_ops = { 
	.hw_params = mtk_hdmi_audio_hw_params,

	.audio_startup = mtk_hdmi_audio_startup,

	.audio_shutdown = mtk_hdmi_audio_shutdown,

	.digital_mute = mtk_hdmi_audio_digital_mute,

	.mute_stream = mtk_hdmi_audio_mute,

	.get_eld = mtk_hdmi_audio_get_eld,

	.hook_plugged_cb = mtk_hdmi_audio_hook_plugged_cb,

	.no_capture_mute = 1,

};



static int mtk_hdmi_register_audio_driver(struct device *dev)

drivers/gpu/drm/rockchip/cdn-dp-core.c

+4 −3
Original line number Diff line number Diff line
@@ -817,8 +817,8 @@ static void cdn_dp_audio_shutdown(struct device *dev, void *data) 
	mutex_unlock(&dp->lock);

}



static int cdn_dp_audio_digital_mute(struct device *dev, void *data,

				     bool enable)

static int cdn_dp_audio_mute_stream(struct device *dev, void *data,

				    bool enable, int direction)

{

	struct cdn_dp_device *dp = dev_get_drvdata(dev);

	int ret;
@@ -849,8 +849,9 @@ static int cdn_dp_audio_get_eld(struct device *dev, void *data, 
static const struct hdmi_codec_ops audio_codec_ops = {

	.hw_params = cdn_dp_audio_hw_params,

	.audio_shutdown = cdn_dp_audio_shutdown,

	.digital_mute = cdn_dp_audio_digital_mute,

	.mute_stream = cdn_dp_audio_mute_stream,

	.get_eld = cdn_dp_audio_get_eld,

	.no_capture_mute = 1,

};



static int cdn_dp_audio_codec_init(struct cdn_dp_device *dp,