diff options
| author | Mark Brown <broonie@kernel.org> | 2020-07-31 19:54:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-07-31 19:54:03 +0100 |
| commit | 84569f329f7fcb40b7b1860f273b2909dabf2a2b (patch) | |
| tree | cd332fbb2947f20cc06e3b80da75b189c8ac624e /drivers/gpu/drm/mediatek/mtk_hdmi.c | |
| parent | c8f7dbdbaa15c700ea02abf92b8d9bda2e91050b (diff) | |
| parent | 8e34f1e867b572f1e20b5250c2897fe5f041c99f (diff) | |
Merge remote-tracking branch 'asoc/for-5.9' into asoc-next
Diffstat (limited to 'drivers/gpu/drm/mediatek/mtk_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/mediatek/mtk_hdmi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c index 1eebe310470a..1b2fb9f35daf 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -1643,7 +1643,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); @@ -1684,9 +1685,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) |