From ec250395a33b48fb9925452ef945910e83dd1bef Mon Sep 17 00:00:00 2001 From: Xinhuang Li Date: Wed, 24 Jul 2019 09:14:21 +0800 Subject: [PATCH] drm: bridge: dw-hdmi: no need update i2s_select when hdmi audio shutdown the previous practice will set the reg of i2s_select to select spdif when audio shutdown and playing spdif at this point will cause the audio to come out of hdmi as well Change-Id: I8f9f53ea71ce83b33e32b575bacd2249da3b7d8f Signed-off-by: Xinhuang Li --- drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c index 463aa3e54465..0343bfbdba0f 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c @@ -209,7 +209,12 @@ static void dw_hdmi_i2s_audio_shutdown(struct device *dev, void *data) dw_hdmi_audio_disable(hdmi); - hdmi_write(audio, HDMI_AUD_CONF0_SW_RESET, HDMI_AUD_CONF0); + hdmi_update_bits(audio, + HDMI_AUD_CONF0_SW_RESET, + HDMI_AUD_CONF0_SW_RESET | + (HDMI_AUD_CONF0_I2S_ALL_ENABLE ^ + HDMI_AUD_CONF0_I2S_SELECT_MASK), + HDMI_AUD_CONF0); } static int dw_hdmi_i2s_get_dai_id(struct snd_soc_component *component,