| author | Jianxin Pan <jianxin.pan@amlogic.com> | 2019-07-31 07:19:06 (GMT) |
|---|---|---|
| committer | Jianxin Pan <jianxin.pan@amlogic.com> | 2019-07-31 07:19:06 (GMT) |
| commit | 04dfff2d98391d06b8dd98d92ad39bf993aa4a6c (patch) | |
| tree | e0e4f9e890de02d951620b1d60b015a71007aa46 | |
| parent | 93343170955d94aa45518edca907ba85a917e6ce (diff) | |
| download | common-04dfff2d98391d06b8dd98d92ad39bf993aa4a6c.zip common-04dfff2d98391d06b8dd98d92ad39bf993aa4a6c.tar.gz common-04dfff2d98391d06b8dd98d92ad39bf993aa4a6c.tar.bz2 | |
Revert "eARCrx: add hdmitx hpd notify [1/1]"
This reverts commit 93343170955d94aa45518edca907ba85a917e6ce.
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
Change-Id: I198c244e0d6877776c966983d00fb554767f3fe0
| -rw-r--r-- | drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c | 3 | ||||
| -rw-r--r-- | include/linux/amlogic/media/sound/spdif_info.h | 8 |
2 files changed, 0 insertions, 11 deletions
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 9df5704..2dc6904 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 @@ -47,7 +47,6 @@ #include "hw_clk.h" #include <linux/arm-smccc.h> #include "checksha.h" -#include <linux/amlogic/media/sound/spdif_info.h> static void mode420_half_horizontal_para(void); static void hdmi_phy_suspend(void); @@ -671,7 +670,6 @@ static irqreturn_t intr_handler(int irq, void *dev) hdev->hdmitx_event |= HDMI_TX_HPD_PLUGIN; hdev->hdmitx_event &= ~HDMI_TX_HPD_PLUGOUT; hdev->rhpd_state = 1; - earc_hdmitx_hpdst(1); queue_delayed_work(hdev->hdmi_wq, &hdev->work_hpd_plugin, HZ / 2); } @@ -680,7 +678,6 @@ static irqreturn_t intr_handler(int irq, void *dev) hdev->hdmitx_event |= HDMI_TX_HPD_PLUGOUT; hdev->hdmitx_event &= ~HDMI_TX_HPD_PLUGIN; hdev->rhpd_state = 0; - earc_hdmitx_hpdst(0); queue_delayed_work(hdev->hdmi_wq, &hdev->work_hpd_plugout, HZ / 20); } diff --git a/include/linux/amlogic/media/sound/spdif_info.h b/include/linux/amlogic/media/sound/spdif_info.h index a3d6c77..36df67a 100644 --- a/include/linux/amlogic/media/sound/spdif_info.h +++ b/include/linux/amlogic/media/sound/spdif_info.h @@ -51,12 +51,4 @@ int aml_get_hdmi_out_audio(struct snd_kcontrol *kcontrol, int aml_set_hdmi_out_audio(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); #endif - -extern void earc_hdmitx_hpdst(bool st); -/* prevent compile error in no HDMIRX case */ -void __attribute__((weak))earc_hdmitx_hpdst(bool st) -{ - pr_info("TODO, NEED TO REWRITE THIS FUNCTION\n"); -} - #endif |