From 2a2d7eb7dd155d863b1cf68bc4b531448c5c44bc Mon Sep 17 00:00:00 2001 From: Zheng Yang Date: Thu, 5 Apr 2012 09:58:12 +0800 Subject: [PATCH] rk30 hdmi: modified for fb interface rk_get_lcdc_drv changed. --- drivers/video/rockchip/hdmi/rk30_hdmi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/video/rockchip/hdmi/rk30_hdmi.c b/drivers/video/rockchip/hdmi/rk30_hdmi.c index ee7a8740778a..e9ac6620ae14 100755 --- a/drivers/video/rockchip/hdmi/rk30_hdmi.c +++ b/drivers/video/rockchip/hdmi/rk30_hdmi.c @@ -23,7 +23,7 @@ struct hdmi *hdmi = NULL; extern irqreturn_t hdmi_irq(int irq, void *priv); extern void hdmi_work(struct work_struct *work); -extern struct rk_lcdc_device_driver * rk_get_lcdc_drv(int id); +extern struct rk_lcdc_device_driver * rk_get_lcdc_drv(char *name); extern void hdmi_register_display_sysfs(struct hdmi *hdmi, struct device *parent); #ifdef CONFIG_HAS_EARLYSUSPEND @@ -91,7 +91,10 @@ static int __devinit rk30_hdmi_probe (struct platform_device *pdev) hdmi->dev = &pdev->dev; platform_set_drvdata(pdev, hdmi); - hdmi->lcdc = rk_get_lcdc_drv(HDMI_SOURCE_DEFAULT); + if(HDMI_SOURCE_DEFAULT == HDMI_SOURCE_LCDC0) + hdmi->lcdc = rk_get_lcdc_drv("lcdc0"); + else + hdmi->lcdc = rk_get_lcdc_drv("lcdc1"); if(hdmi->lcdc == NULL) { dev_err(hdmi->dev, "can not connect to video source lcdc\n"); -- 2.34.1