| author | Xindong Xu <xindong.xu@amlogic.com> | 2018-04-10 09:30:32 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2018-04-10 09:30:32 (GMT) |
| commit | 73e8b07a72fbb8da3ac02ec81f2c386d9d39184d (patch) | |
| tree | 08c0bd63811f2ae0e41fa4ca77e01171e87569ec | |
| parent | 13c375e0d04354f80d61ef0ba998ebcd5ddf9353 (diff) | |
| parent | a73f7cf102f31a6268f999dd05468a9d95cadb56 (diff) | |
| download | common-73e8b07a72fbb8da3ac02ec81f2c386d9d39184d.zip common-73e8b07a72fbb8da3ac02ec81f2c386d9d39184d.tar.gz common-73e8b07a72fbb8da3ac02ec81f2c386d9d39184d.tar.bz2 | |
Merge "hdmi_tx: fix hdmitx event extcon_audio when rising" into ampere-20180311
| -rw-r--r-- | drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c | 2 | ||||
| -rw-r--r-- | drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c | 2 |
2 files changed, 1 insertions, 3 deletions
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 d791870..1708c1a 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 @@ -2744,7 +2744,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_excton_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 bdc0d6b..c24b007 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 @@ -646,8 +646,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, |