lcdc:rename CONFIG_RK616_LVDS to CONFIG_RK616_VIF

diff --git a/drivers/video/rockchip/lcdc/rk3066b_lcdc.c b/drivers/video/rockchip/lcdc/rk3066b_lcdc.c
index 9a1a7cf2e08bb111fe26cff373e3bc99ad5894b6..11b8c8a27671f7f8ca1e8cd879c3337f05d85619 100755 (executable)
--- a/drivers/video/rockchip/lcdc/rk3066b_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3066b_lcdc.c
@@ -1139,7 +1139,7 @@ static int __devinit rk3066b_lcdc_probe (struct platform_device *pdev)
        screen->lcdc_id = lcdc_dev->id;
        screen->screen_id = 0;
 
-#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_LVDS))
+#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_VIF))
        screen1 =  kzalloc(sizeof(rk_screen), GFP_KERNEL);
        if(!screen1)
        {
@@ -1181,7 +1181,7 @@ static int __devinit rk3066b_lcdc_probe (struct platform_device *pdev)
        printk("lcdc%d:reg_phy_base = 0x%08x,reg_vir_base:0x%p\n",pdev->id,lcdc_dev->reg_phy_base, lcdc_dev->preg);
        lcdc_dev->driver.dev=&pdev->dev;
        lcdc_dev->driver.screen0 = screen;
-#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_LVDS))
+#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_VIF))
        lcdc_dev->driver.screen1 = screen1;
 #endif
        lcdc_dev->driver.cur_screen = screen;

diff --git a/drivers/video/rockchip/lcdc/rk30_lcdc.c b/drivers/video/rockchip/lcdc/rk30_lcdc.c
index d1ce4ab1892e36293d4559c59656c70acca2d373..ef80d5e3a0855b9e644a20927b30266377a5f6e8 100644 (file)
--- a/drivers/video/rockchip/lcdc/rk30_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk30_lcdc.c
@@ -1541,7 +1541,7 @@ static int __devinit rk30_lcdc_probe (struct platform_device *pdev)
                screen->lcdc_id = lcdc_dev->id;
                screen->screen_id = 0;
        }
-#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&&  (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_LVDS))
+#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&&  (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_VIF))
        screen1 =  kzalloc(sizeof(rk_screen), GFP_KERNEL);
        if(!screen1)
        {
@@ -1591,7 +1591,7 @@ static int __devinit rk30_lcdc_probe (struct platform_device *pdev)
        printk("lcdc%d:reg_phy_base = 0x%08x,reg_vir_base:0x%p\n",pdev->id,lcdc_dev->reg_phy_base, lcdc_dev->regs);
        lcdc_dev->driver.dev=&pdev->dev;
        lcdc_dev->driver.screen0 = screen;
-#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_LVDS))
+#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_VIF))
        lcdc_dev->driver.screen1 = screen1;
 #endif
        lcdc_dev->driver.cur_screen = screen;

diff --git a/drivers/video/rockchip/lcdc/rk3188_lcdc.c b/drivers/video/rockchip/lcdc/rk3188_lcdc.c
index 8ac6fa3ad2e29ca660ec886030be5fcb9811588a..30e70a1d8e05f566eb9fa05b5d6c1fa5e4a53662 100644 (file)
--- a/drivers/video/rockchip/lcdc/rk3188_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3188_lcdc.c
@@ -1394,7 +1394,7 @@ static int __devinit rk3188_lcdc_probe(struct platform_device *pdev)
        }
        screen->lcdc_id = lcdc_dev->id;
        screen->screen_id = 0;
-#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&&  (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_LVDS))
+#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&&  (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_VIF))
        screen1 =  kzalloc(sizeof(rk_screen), GFP_KERNEL);
        if(!screen1)
        {
@@ -1444,7 +1444,7 @@ static int __devinit rk3188_lcdc_probe(struct platform_device *pdev)
        printk("lcdc%d:reg_phy_base = 0x%08x,reg_vir_base:0x%p\n",pdev->id,lcdc_dev->reg_phy_base, lcdc_dev->regs);
        lcdc_dev->driver.dev = dev;
        lcdc_dev->driver.screen0 = screen;
-#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_LVDS))
+#if defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)&& (defined(CONFIG_RK610_LVDS) || defined(CONFIG_RK616_VIF))
        lcdc_dev->driver.screen1 = screen1;
 #endif
        lcdc_dev->driver.cur_screen = screen;