From: qi.yuan Date: Tue, 13 Mar 2018 08:02:06 +0000 (+0800) Subject: hdmi_tx: fix hdmitx event extcon_audio when rising X-Git-Tag: khadas-vims-v0.9.6-release~2308 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d4875186962a8611e154cc4fd64920a612bf363;p=platform%2Fkernel%2Flinux-amlogic.git hdmi_tx: fix hdmitx event extcon_audio when rising PD#161285: fix extcon_audio event occur before extcon_hdmi when rising Change-Id: I70fd070f62cc36e76aeba260420b24df1b1fe29f Signed-off-by: qi.yuan --- diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c index c00ddbe..4d80346 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c @@ -2991,7 +2991,7 @@ static void hdmitx_hpd_plugin_handler(struct work_struct *work) hdmitx_notify_hpd(hdev->hpd_state); extcon_set_state_sync(hdmitx_extcon_hdmi, EXTCON_DISP_HDMI, 1); - + extcon_set_state_sync(hdmitx_extcon_audio, EXTCON_DISP_HDMI, 1); mutex_unlock(&setclk_mutex); } diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c index 1cae83c..b6966b4 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c @@ -652,8 +652,6 @@ static irqreturn_t intr_handler(int irq, void *dev) } /* HPD rising */ if (data32 & (1 << 1)) { - queue_delayed_work(hdev->hdmi_wq, - &hdev->work_aud_hpd_plug, HZ / 2); hdev->hdmitx_event |= HDMI_TX_HPD_PLUGIN; hdev->hdmitx_event &= ~HDMI_TX_HPD_PLUGOUT; queue_delayed_work(hdev->hdmi_wq,