Skip to content

Commit

Permalink
drm/exynos: use platform_get_irq_byname for hdmi
Browse files Browse the repository at this point in the history
The exynos hdmi supports two hdmi interrupts - external and internal, so
use platform_get_irq_byname to distinguish their resources.

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
  • Loading branch information
Joonyoung Shim authored and Inki Dae committed May 8, 2012
1 parent 7ecd34e commit ce80a2d
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions drivers/gpu/drm/exynos/exynos_hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -2293,10 +2293,10 @@ static int __devinit hdmi_probe(struct platform_device *pdev)

hdata->hdmiphy_port = hdmi_hdmiphy;

res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (res == NULL) {
DRM_ERROR("get interrupt resource failed.\n");
ret = -ENXIO;
hdata->irq = platform_get_irq_byname(pdev, "internal_irq");
if (hdata->irq < 0) {
DRM_ERROR("failed to get platform irq\n");
ret = hdata->irq;
goto err_hdmiphy;
}

Expand All @@ -2311,13 +2311,12 @@ static int __devinit hdmi_probe(struct platform_device *pdev)
INIT_WORK(&hdata->hotplug_work, hdmi_hotplug_func);

/* register hpd interrupt */
ret = request_irq(res->start, hdmi_irq_handler, 0, "drm_hdmi",
ret = request_irq(hdata->irq, hdmi_irq_handler, 0, "drm_hdmi",
drm_hdmi_ctx);
if (ret) {
DRM_ERROR("request interrupt failed.\n");
goto err_workqueue;
}
hdata->irq = res->start;

/* register specific callbacks to common hdmi. */
exynos_hdmi_ops_register(&hdmi_ops);
Expand Down

0 comments on commit ce80a2d

Please sign in to comment.