---

yaml --- r: 284837 b: refs/heads/master c: a2065a3 h: refs/heads/master i: 284835: cba813e v: v3
git-mirror · Nov 21, 2011 · 8fb6749 · 8fb6749
1 parent 3e22570
commit 8fb6749
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git 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
@@ -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 */
 
 	/*