From: yxj <yxj@rock-chips.com>
Date: Mon, 31 Dec 2012 02:54:18 +0000 (+0800)
Subject: workround for DS1006H temporily,DS1006H use lcdc1 as primary display device
X-Git-Tag: firefly_0821_release~8029
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=21ba63aa15a3c8c70ecceaddd26addf1f6157270;p=firefly-linux-kernel-4.4.55.git

workround for DS1006H temporily,DS1006H use lcdc1 as primary display device
---

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index 9bbd3af95437..cfc3e6e7730d 100644
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -1175,7 +1175,9 @@ int rk_fb_register(struct rk_lcdc_device_driver *dev_drv,
 	}
 #if !defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_LOGO)
 
+#if !defined(CONFIG_MACH_RK3168_DS1006H)
     if(id == 0)
+#endif 
     {
 	    fb_inf->fb[0]->fbops->fb_open(fb_inf->fb[0],1);
 	    dev_drv->load_screen(dev_drv,1);