shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk3036 hdmi: use irq to trigger hdmi mode change

Browse Source
This commit is contained in:
hjc
2014-07-12 15:46:17 +08:00
parent 5bfaf8c9a6
commit 0f24a80293
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.c
View File

@@ -249,7 +249,6 @@ static void __maybe_unused rk616_irq_work_func(struct work_struct *work)
dev_info(hdmi_drv->dev, "func: %s, enable_irq\n", __func__);
enable_irq(hdmi_drv->irq);
}
#if 0
static irqreturn_t rk616_hdmi_irq(int irq, void *dev_id)
{
struct work_struct *rk616_irq_work_struct;
@@ -271,7 +270,7 @@ static irqreturn_t rk616_hdmi_irq(int irq, void *dev_id)
}
return IRQ_HANDLED;
}
#endif
static int rk616_hdmi_drv_init(struct hdmi *hdmi_drv)
{
int ret = 0;
@@ -398,7 +397,6 @@ static int rk616_hdmi_probe(struct platform_device *pdev)
hdmi_drv->irq = 0;
} else {
/* request the IRQ */
#if 0
ret = devm_request_irq(hdmi_drv->dev, hdmi_drv->irq,
rk616_hdmi_irq, 0,
dev_name(hdmi_drv->dev), hdmi_drv);
@@ -407,7 +405,6 @@ static int rk616_hdmi_probe(struct platform_device *pdev)
ret);
goto err2;
}
#endif
}
#else
if (gpio_is_valid(hdmi_dev->rk616_drv->pdata->hdmi_irq)) {

2
drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.c
View File

@@ -631,7 +631,7 @@ static void rk616_hdmi_reset(struct hdmi *hdmi_drv)
#ifdef SOC_CONFIG_RK3036
hdmi_readl(hdmi_dev, HDMI_STATUS,&val);//enable hpg
val |= m_MASK_INT_HOTPLUG;
hdmi_writel(hdmi_dev, HDMI_STATUS,val);
//hdmi_writel(hdmi_dev, HDMI_STATUS,val);
#else
hdmi_writel(hdmi_dev, INTERRUPT_MASK1, m_INT_HOTPLUG);
#endif