rk2928: hdmi init

diff --git a/drivers/video/rockchip/hdmi/chips/rk2928/rk2928_hdmi.c b/drivers/video/rockchip/hdmi/chips/rk2928/rk2928_hdmi.c
index 1ef14180bd6f5aa367895b93e36ada67b51a3d0e..09b55b1c9d8634c08028f0a9c6862513cc989957 100755 (executable)
--- a/drivers/video/rockchip/hdmi/chips/rk2928/rk2928_hdmi.c
+++ b/drivers/video/rockchip/hdmi/chips/rk2928/rk2928_hdmi.c
@@ -111,7 +111,7 @@ static int __devinit rk2928_hdmi_probe (struct platform_device *pdev)
        hdmi = kmalloc(sizeof(struct hdmi), GFP_KERNEL);\r
        if(!hdmi)\r
        {\r
-       dev_err(&pdev->dev, ">>rk30 hdmi kmalloc fail!");\r
+       dev_err(&pdev->dev, ">>rk2928 hdmi kmalloc fail!");\r
        return -ENOMEM;\r
        }\r
        memset(hdmi, 0, sizeof(struct hdmi));\r
@@ -130,7 +130,7 @@ static int __devinit rk2928_hdmi_probe (struct platform_device *pdev)
        }\r
        hdmi->xscale = 95;\r
        hdmi->yscale = 95;\r
-       \r
+#if 0  \r
        hdmi->hclk = clk_get(NULL,"hclk_hdmi");\r
        if(IS_ERR(hdmi->hclk))\r
        {\r
@@ -139,7 +139,7 @@ static int __devinit rk2928_hdmi_probe (struct platform_device *pdev)
                goto err0;\r
        }\r
        clk_enable(hdmi->hclk);\r
-       \r
+#endif \r
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);\r
        if (!res) {\r
                dev_err(hdmi->dev, "Unable to get register resource\n");\r
@@ -206,7 +206,7 @@ static int __devinit rk2928_hdmi_probe (struct platform_device *pdev)
                goto err2;\r
        }\r
 \r
-       hdmi_dbg(hdmi->dev, "rk30 hdmi probe sucess.\n");\r
+       dev_info(hdmi->dev, "rk2928 hdmi probe success.\n");\r
        return 0;\r
 err2:\r
        #ifdef CONFIG_SWITCH\r
@@ -219,9 +219,11 @@ err2:
        iounmap((void*)hdmi->regbase);\r
 err1:\r
        release_mem_region(res->start,(res->end - res->start) + 1);\r
+#if 0\r
        clk_disable(hdmi->hclk);\r
+#endif\r
 err0:\r
-       hdmi_dbg(hdmi->dev, "rk30 hdmi probe error.\n");\r
+       hdmi_dbg(hdmi->dev, "rk2928 hdmi probe error.\n");\r
        kfree(hdmi);\r
        hdmi = NULL;\r
        return ret;\r
@@ -246,7 +248,9 @@ static int __devexit rk2928_hdmi_remove(struct platform_device *pdev)
                #endif\r
                iounmap((void*)hdmi->regbase);\r
                release_mem_region(hdmi->regbase_phy, hdmi->regsize_phy);\r
+        #if 0\r
                clk_disable(hdmi->hclk);\r
+        #endif\r
                fb_destroy_modelist(&hdmi->edid.modelist);\r
                if(hdmi->edid.audio)\r
                        kfree(hdmi->edid.audio);\r
@@ -259,7 +263,7 @@ static int __devexit rk2928_hdmi_remove(struct platform_device *pdev)
                kfree(hdmi);\r
                hdmi = NULL;\r
        }\r
-       printk(KERN_INFO "rk30 hdmi removed.\n");\r
+       printk(KERN_INFO "rk2928 hdmi removed.\n");\r
        return 0;\r
 }\r
 \r
@@ -270,14 +274,14 @@ static void rk2928_hdmi_shutdown(struct platform_device *pdev)
                unregister_early_suspend(&hdmi->early_suspend);\r
                #endif\r
        }\r
-       printk(KERN_INFO "rk30 hdmi shut down.\n");\r
+       printk(KERN_INFO "rk2928 hdmi shut down.\n");\r
 }\r
 \r
 static struct platform_driver rk2928_hdmi_driver = {\r
        .probe          = rk2928_hdmi_probe,\r
        .remove         = __devexit_p(rk2928_hdmi_remove),\r
        .driver         = {\r
-               .name   = "rk30-hdmi",\r
+               .name   = "rk2928-hdmi",\r
                .owner  = THIS_MODULE,\r
        },\r
        .shutdown   = rk2928_hdmi_shutdown,\r

diff --git a/drivers/video/rockchip/hdmi/rk_hdmi.h b/drivers/video/rockchip/hdmi/rk_hdmi.h
index cf6d34c6ce809da1adeda0829799686cb1fb011f..83d3925e482bfe55e80036538f7f4639f90aead1 100755 (executable)
--- a/drivers/video/rockchip/hdmi/rk_hdmi.h
+++ b/drivers/video/rockchip/hdmi/rk_hdmi.h
@@ -28,7 +28,11 @@ enum {
 };
 
 /* default HDMI video source */
+#ifdef CONFIG_ARCH_RK2928
+#define HDMI_SOURCE_DEFAULT            HDMI_SOURCE_LCDC0
+#else
 #define HDMI_SOURCE_DEFAULT            HDMI_SOURCE_LCDC1
+#endif
 /* If HDMI_ENABLE, system will auto configure output mode according to EDID 
  * If HDMI_DISABLE, system will output mode according to macro HDMI_VIDEO_DEFAULT_MODE
  */