viafb: Add 1200x900 DCON/LCD panel modes for OLPC XO-1.5

[jc: extensive merge conflict fixes]
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: ScottFang@viatech.com.cn
Cc: JosephChan@via.com.tw
Signed-off-by: Chris Ball <cjb@laptop.org>

1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c
index 1b1ccdc2d83d..09020f0b2d2a 100644
--- a/drivers/video/via/lcd.c
+++ b/drivers/video/via/lcd.c
@@ -398,6 +398,15 @@ static void fp_id_to_vindex(int panel_id)
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
                 viaparinfo->lvds_setting_info->LCDDithering = 1;
                 break;
+        case 0x17:
+                /* OLPC XO-1.5 panel */
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1200;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 900;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_IDD_1200X900;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                break;
         default:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 800;
                 viaparinfo->lvds_setting_info->lcd_panel_vres = 600;