From 8fb67490ab2a742db9408a0896b32640c5f41bac Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Tue, 8 Nov 2011 20:35:56 -0800
Subject: [PATCH] --- yaml --- r: 284837 b: refs/heads/master c:
 a2065a368cc2539d6a48450f367f5033c699cdc4 h: refs/heads/master i:   284835:
 cba813ee32e806e4f95564b0ec11056afcd7f841 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/video/sh_mipi_dsi.c | 23 +++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 1d40653e5921..0efed3392518 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2658b70f06108361aa5024798f9c1bf47c73374
+refs/heads/master: a2065a368cc2539d6a48450f367f5033c699cdc4
diff --git a/trunk/drivers/video/sh_mipi_dsi.c b/trunk/drivers/video/sh_mipi_dsi.c
index f2c3f945f77b..187e12739b99 100644
--- a/trunk/drivers/video/sh_mipi_dsi.c
+++ b/trunk/drivers/video/sh_mipi_dsi.c
@@ -245,18 +245,6 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
 
 	/* setup DSI link */
 
-	/*
-	 * Default = ULPS enable |
-	 *	Contention detection enabled |
-	 *	EoT packet transmission enable |
-	 *	CRC check enable |
-	 *	ECC check enable
-	 * additionally enable first two lanes
-	 */
-	bitmap_fill((unsigned long *)&tmp, pdata->lane);
-	tmp |= 0x00003700;
-	iowrite32(tmp, base + SYSCONF);
-
 	/*
 	 * T_wakeup = 0x7000
 	 * T_hs-trail = 3
@@ -287,6 +275,17 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
 	/* Deassert resets, power on */
 	iowrite32(0x03070001, base + PHYCTRL);
 
+	/*
+	 * Default = ULPS enable |
+	 *	Contention detection enabled |
+	 *	EoT packet transmission enable |
+	 *	CRC check enable |
+	 *	ECC check enable
+	 */
+	bitmap_fill((unsigned long *)&tmp, pdata->lane);
+	tmp |= 0x00003700;
+	iowrite32(tmp, base + SYSCONF);
+
 	/* setup l-bridge */
 
 	/*