diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 67ca5fe4613..53d95480a85 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -260,7 +260,7 @@ config BACKLIGHT_MXC_MC13892
 
 
 config BACKLIGHT_MXC_EFIKASB
-       tristate "MXC Efikasb LCD Backlight Driver"
+       tristate "Efika MX Smartbook LCD Backlight Driver"
        depends on BACKLIGHT_MXC
        default y
 
diff --git a/drivers/video/backlight/mxc_efikasb_bl.c b/drivers/video/backlight/mxc_efikasb_bl.c
index bb0aee5b4ea..ab9f23e46e3 100644
--- a/drivers/video/backlight/mxc_efikasb_bl.c
+++ b/drivers/video/backlight/mxc_efikasb_bl.c
@@ -16,7 +16,7 @@
 /*!
  * @file mxc_efikasb_bl.c
  *
- * @brief Backlight Driver for LCDC PWM on Freescale MXC/i.MX  Efikasb platforms.
+ * @brief Backlight Driver for LCDC PWM on Genesi Efika MX Smartbook.
  *
  * This file contains API defined in include/linux/clk.h for setting up and
  * retrieving clocks.
@@ -327,6 +327,6 @@ static void __exit mxcbl_exit(void)
 module_init(mxcbl_init);
 module_exit(mxcbl_exit);
 
-MODULE_DESCRIPTION("Pegatron iMX51 Efikasb LCDC PWM Backlight Driver");
+MODULE_DESCRIPTION("Genesi Efika MX Smartbook Backlight Driver");
 MODULE_AUTHOR("Pegatron Corp.");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/mxc/Kconfig b/drivers/video/mxc/Kconfig
index 00c9c084dcf..e27f7ee498b 100644
--- a/drivers/video/mxc/Kconfig
+++ b/drivers/video/mxc/Kconfig
@@ -39,23 +39,18 @@ config FB_MXC_CLAA_WVGA_SYNC_PANEL
 	tristate "CLAA WVGA Panel"
 
 config FB_MXC_SII9022
-	depends on FB_MXC_SYNC_PANEL
+	depends on FB_MXC_SYNC_PANEL && MACH_MX51_EFIKAMX
 	tristate "SII9022A HDMI Interface Chip"
 
 config FB_MXC_CS8556
-        depends on FB_MXC_SYNC_PANEL
+        depends on FB_MXC_SYNC_PANEL && MACH_MX51_EFIKAMX
         tristate "Myson CS8556 VGA Interface Chip"
-        default y
-
-
-
 
 config FB_MXC_MTL017
-        depends on FB_MXC_SYNC_PANEL
+        depends on FB_MXC_SYNC_PANEL && MACH_MX51_EFIKASB
         tristate "Myson MTL017 LVDS Controller"
         default n
 
-
 config FB_MXC_CH7026
 	depends on FB_MXC_SYNC_PANEL
 	tristate "Chrontel CH7026 VGA Interface Chip"
diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c
index f8a349a17db..c7169e13f21 100644
--- a/drivers/video/mxc/mxc_ipuv3_fb.c
+++ b/drivers/video/mxc/mxc_ipuv3_fb.c
@@ -166,16 +166,18 @@ static int mxcfb_set_fix(struct fb_info *info)
 	fix->ypanstep = 1;
 
 #if defined(CONFIG_MACH_MX51_EFIKAMX)
-	if( clock_auto && extsync ) {
-		if ( var->pixclock < pixclk_limit ) {
-			printk(KERN_INFO "exceed pixel clock limit %d, auto adjust to 720p\n", pixclk_limit );
-			fb_find_mode( var, info, "1280x720-24@60", NULL, 0, NULL, 0 );
+	if (board_is_mx51_efikamx()) {
+		if( clock_auto && extsync ) {
+			if ( var->pixclock < pixclk_limit ) {
+				printk(KERN_INFO "exceed pixel clock limit %d, auto adjust to 720p\n", pixclk_limit );
+				fb_find_mode( var, info, "1280x720-24@60", NULL, 0, NULL, 0 );
+			}
+			var->sync |= FB_SYNC_EXT;	/* x window need it otherwise refresh rate will become bigger than user specified */
 		}
-		var->sync |= FB_SYNC_EXT;	/* x window need it otherwise refresh rate will become bigger than user specified */
+		/* skip mxc_sdc_fb.2 (overlay) configure */
+		if ( ((struct mxcfb_info *)info->par)->ipu_ch != MEM_FG_SYNC)
+			mxcfb_adjust( var );
 	}
-	/* skip mxc_sdc_fb.2 (overlay) configure */
-	if ( ((struct mxcfb_info *)info->par)->ipu_ch != MEM_FG_SYNC)
-		mxcfb_adjust( var );
 #endif
 
 	return 0;
@@ -1709,9 +1711,11 @@ static int mxcfb_probe(struct platform_device *pdev)
 
 	/* Default Y virtual size is 2x panel size */
 #if defined(CONFIG_MACH_MX51_EFIKAMX)
-	fbi->var.yres_virtual = fbi->var.yres * 2;
+	if (0 || board_is_mx51_efikamx()) /* disabled pending retest */
+		fbi->var.yres_virtual = fbi->var.yres * 2;
+	else
 #else
-	fbi->var.yres_virtual = fbi->var.yres * 3;
+		fbi->var.yres_virtual = fbi->var.yres * 3;
 #endif
 
 	mxcfb_set_fix(fbi);