Merge "Latest display init code" into android-3.10-bringup

1 files changed, 24 insertions, 24 deletions

diff --git a/drivers/video/omap2/displays/panel-ili9342.c b/drivers/video/omap2/displays/panel-ili9342.c
index beeec62ca80..9993cc75191 100644
--- a/drivers/video/omap2/displays/panel-ili9342.c
+++ b/drivers/video/omap2/displays/panel-ili9342.c
@@ -394,14 +394,14 @@ static inline void ili9342_init_seq(struct spi_device *spi) {
 	ili9342_write_data(spi, 0x00);
 
 	ili9342_write_cmd(spi, 0xC0);
-	ili9342_write_data(spi, 0x12);
-	ili9342_write_data(spi, 0x0F);
+	ili9342_write_data(spi, 0x0B);
+	ili9342_write_data(spi, 0x09);
 
 	ili9342_write_cmd(spi, 0xC1);
 	ili9342_write_data(spi, 0x12);
 
 	ili9342_write_cmd(spi, 0xC5);
-	ili9342_write_data(spi, 0xDE);
+	ili9342_write_data(spi, 0xDA);
 
 // RGB color mode
 
@@ -419,36 +419,36 @@ static inline void ili9342_init_seq(struct spi_device *spi) {
 
 	ili9342_write_cmd(spi, 0xE0);
 	ili9342_write_data(spi, 0x00);  //63
-	ili9342_write_data(spi, 0x10);  //62
-	ili9342_write_data(spi, 0x19);  //61
-	ili9342_write_data(spi, 0x05);  //59
+	ili9342_write_data(spi, 0x0e);  //62
+	ili9342_write_data(spi, 0x17);  //61
+	ili9342_write_data(spi, 0x06);  //59
 	ili9342_write_data(spi, 0x12);  //57
-	ili9342_write_data(spi, 0x07);  //50
+	ili9342_write_data(spi, 0x06);  //50
 	ili9342_write_data(spi, 0x41);  //43
-	ili9342_write_data(spi, 0x48);  //27
-	ili9342_write_data(spi, 0x5a);  //20
-	ili9342_write_data(spi, 0x02);  //13
-	ili9342_write_data(spi, 0x0b);  //06
-	ili9342_write_data(spi, 0x09);  //04
-	ili9342_write_data(spi, 0x33);  //02
+	ili9342_write_data(spi, 0x68);  //27
+	ili9342_write_data(spi, 0x58);  //20
+	ili9342_write_data(spi, 0x06);  //13
+	ili9342_write_data(spi, 0x0f);  //06
+	ili9342_write_data(spi, 0x0d);  //04
+	ili9342_write_data(spi, 0x34);  //02
 	ili9342_write_data(spi, 0x37);  //01
 	ili9342_write_data(spi, 0x0F);  //00
 
 	ili9342_write_cmd(spi, 0xE1);
-	ili9342_write_data(spi, 0x00);  //00
-	ili9342_write_data(spi, 0x0f);  //01
-	ili9342_write_data(spi, 0x14);  //02
-	ili9342_write_data(spi, 0x03);  //04
-	ili9342_write_data(spi, 0x0e);  //06
-	ili9342_write_data(spi, 0x03);  //13
-	ili9342_write_data(spi, 0x35);  //20
-	ili9342_write_data(spi, 0x52);  //27
-	ili9342_write_data(spi, 0x49);  //43
+	ili9342_write_data(spi, 0x08);  //00
+	ili9342_write_data(spi, 0x10);  //01
+	ili9342_write_data(spi, 0x17);  //02
+	ili9342_write_data(spi, 0x06);  //04
+	ili9342_write_data(spi, 0x12);  //06
+	ili9342_write_data(spi, 0x07);  //13
+	ili9342_write_data(spi, 0x37);  //20
+	ili9342_write_data(spi, 0x54);  //27
+	ili9342_write_data(spi, 0x4e);  //43
 	ili9342_write_data(spi, 0x07);  //50
 	ili9342_write_data(spi, 0x10);  //57
 	ili9342_write_data(spi, 0x0e);  //59
-	ili9342_write_data(spi, 0x31);  //61
-	ili9342_write_data(spi, 0x34);  //62
+	ili9342_write_data(spi, 0x34);  //61
+	ili9342_write_data(spi, 0x36);  //62
 	ili9342_write_data(spi, 0x0F);  //63
 
 	ili9342_write_cmd(spi, 0x35);