Commit bb1d67bf authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

ASoC: hdmi-codec: move no_capture_mute to struct hdmi_codec_pdata 



The no_capture_mute flag might differ from platform to platform,
especially in the case of the wrapping implementations, like the
upcoming DRM HDMI Codec framework. Move the flag next to all other flags
in struct hdmi_codec_pdata.

Acked-by: default avatarMark Brown <broonie@kernel.org>
Tested-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241224-drm-bridge-hdmi-connector-v10-2-dc89577cd438@linaro.org


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 6af45d7d

drivers/gpu/drm/bridge/ite-it66121.c

+1 −1
Original line number Diff line number Diff line
@@ -1466,7 +1466,6 @@ static const struct hdmi_codec_ops it66121_audio_codec_ops = { 
	.audio_shutdown = it66121_audio_shutdown,

	.mute_stream = it66121_audio_mute,

	.get_eld = it66121_audio_get_eld,

	.no_capture_mute = 1,

};



static int it66121_audio_codec_init(struct it66121_ctx *ctx, struct device *dev)
@@ -1476,6 +1475,7 @@ static int it66121_audio_codec_init(struct it66121_ctx *ctx, struct device *dev) 
		.i2s = 1, /* Only i2s support for now */

		.spdif = 0,

		.max_i2s_channels = 8,

		.no_capture_mute = 1,

	};



	dev_dbg(dev, "%s\n", __func__);

drivers/gpu/drm/bridge/sii902x.c

+1 −1
Original line number Diff line number Diff line
@@ -841,7 +841,6 @@ static const struct hdmi_codec_ops sii902x_audio_codec_ops = { 
	.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,
@@ -864,6 +863,7 @@ static int sii902x_audio_codec_init(struct sii902x *sii902x, 
		.i2s = 1, /* Only i2s support for now. */

		.spdif = 0,

		.max_i2s_channels = 0,

		.no_capture_mute = 1,

	};

	u8 lanes[4];

	int num_lanes, i;

drivers/gpu/drm/exynos/exynos_hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -1660,7 +1660,6 @@ static const struct hdmi_codec_ops audio_codec_ops = { 
	.audio_shutdown = hdmi_audio_shutdown,

	.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)
@@ -1669,6 +1668,7 @@ static int hdmi_register_audio_device(struct hdmi_context *hdata) 
		.ops = &audio_codec_ops,

		.max_i2s_channels = 6,

		.i2s = 1,

		.no_capture_mute = 1,

	};



	hdata->audio.pdev = platform_device_register_data(

drivers/gpu/drm/i2c/tda998x_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -1165,7 +1165,6 @@ static const struct hdmi_codec_ops audio_codec_ops = { 
	.audio_shutdown = tda998x_audio_shutdown,

	.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,
@@ -1176,6 +1175,7 @@ static int tda998x_audio_codec_init(struct tda998x_priv *priv, 
		.max_i2s_channels = 2,

		.no_i2s_capture = 1,

		.no_spdif_capture = 1,

		.no_capture_mute = 1,

	};



	if (priv->audio_port_enable[AUDIO_ROUTE_I2S])

drivers/gpu/drm/mediatek/mtk_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -2615,7 +2615,6 @@ static const struct hdmi_codec_ops mtk_dp_audio_codec_ops = { 
	.audio_shutdown = mtk_dp_audio_shutdown,

	.get_eld = mtk_dp_audio_get_eld,

	.hook_plugged_cb = mtk_dp_audio_hook_plugged_cb,

	.no_capture_mute = 1,

};



static int mtk_dp_register_audio_driver(struct device *dev)
@@ -2626,6 +2625,7 @@ static int mtk_dp_register_audio_driver(struct device *dev) 
		.max_i2s_channels = 8,

		.i2s = 1,

		.data = mtk_dp,

		.no_capture_mute = 1,

	};



	mtk_dp->audio_pdev = platform_device_register_data(dev,