From 0dd4ee06c7b702b358d730b812f0cb3f30827d78 Mon Sep 17 00:00:00 2001
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Mon, 28 Apr 2008 02:15:21 -0700
Subject: [PATCH] --- yaml --- r: 94175 b: refs/heads/master c:
 fd0858017eb67aa0d41dd4e8499ca6a7bfb63941 h: refs/heads/master i:   94173:
 6345097d835e0c4200ee9d72b0807a10a7fbaf25   94171:
 00f4dce887d0adf8159534646029bbca1fe97cf6   94167:
 d4b8382c45f83370ea44c2260d79a2a9bf5e859c   94159:
 30f22233f1c066be78b7f2a00be4b9019dbac62a   94143:
 6eaed97e335e541ecb3fa9f83e4c6bf17d175e11 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/video/atmel_lcdfb.c | 27 ++++++++++++++++++++++-----
 trunk/include/video/atmel_lcdc.h  | 10 ++++++++++
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f3ba8bbca228..506512d5c5ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf19a37e0641d975d271a5a30f097dd6b96d232f
+refs/heads/master: fd0858017eb67aa0d41dd4e8499ca6a7bfb63941
diff --git a/trunk/drivers/video/atmel_lcdfb.c b/trunk/drivers/video/atmel_lcdfb.c
index 6fcf76c12910..5a31a7a40cd4 100644
--- a/trunk/drivers/video/atmel_lcdfb.c
+++ b/trunk/drivers/video/atmel_lcdfb.c
@@ -338,19 +338,35 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
 		break;
 	case 15:
 	case 16:
-		var->red.offset = 0;
+		if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {
+			/* RGB:565 mode */
+			var->red.offset = 11;
+			var->blue.offset = 0;
+			var->green.length = 6;
+		} else {
+			/* BGR:555 mode */
+			var->red.offset = 0;
+			var->blue.offset = 10;
+			var->green.length = 5;
+		}
 		var->green.offset = 5;
-		var->blue.offset = 10;
-		var->red.length = var->green.length = var->blue.length = 5;
+		var->red.length = var->blue.length = 5;
 		break;
 	case 32:
 		var->transp.offset = 24;
 		var->transp.length = 8;
 		/* fall through */
 	case 24:
-		var->red.offset = 0;
+		if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {
+			/* RGB:888 mode */
+			var->red.offset = 16;
+			var->blue.offset = 0;
+		} else {
+			/* BGR:888 mode */
+			var->red.offset = 0;
+			var->blue.offset = 16;
+		}
 		var->green.offset = 8;
-		var->blue.offset = 16;
 		var->red.length = var->green.length = var->blue.length = 8;
 		break;
 	default:
@@ -697,6 +713,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
 		sinfo->atmel_lcdfb_power_control = pdata_sinfo->atmel_lcdfb_power_control;
 		sinfo->guard_time = pdata_sinfo->guard_time;
 		sinfo->lcdcon_is_backlight = pdata_sinfo->lcdcon_is_backlight;
+		sinfo->lcd_wiring_mode = pdata_sinfo->lcd_wiring_mode;
 	} else {
 		dev_err(dev, "cannot get default configuration\n");
 		goto free_info;
diff --git a/trunk/include/video/atmel_lcdc.h b/trunk/include/video/atmel_lcdc.h
index 2fd9fad922e5..ed64862c4e18 100644
--- a/trunk/include/video/atmel_lcdc.h
+++ b/trunk/include/video/atmel_lcdc.h
@@ -22,6 +22,15 @@
 #ifndef __ATMEL_LCDC_H__
 #define __ATMEL_LCDC_H__
 
+
+/* Way LCD wires are connected to the chip:
+ * Some Atmel chips use BGR color mode (instead of standard RGB)
+ * A swapped wiring onboard can bring to RGB mode.
+ */
+#define ATMEL_LCDC_WIRING_BGR	0
+#define ATMEL_LCDC_WIRING_RGB	1
+
+
  /* LCD Controller info data structure, stored in device platform_data */
 struct atmel_lcdfb_info {
 	spinlock_t		lock;
@@ -42,6 +51,7 @@ struct atmel_lcdfb_info {
 	u8			saved_lcdcon;
 
 	u8			default_bpp;
+	u8			lcd_wiring_mode;
 	unsigned int		default_lcdcon2;
 	unsigned int		default_dmacon;
 	void (*atmel_lcdfb_power_control)(int on);