diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2011-11-08 23:35:56 -0500 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-11-21 18:43:22 -0500 |
commit | a2065a368cc2539d6a48450f367f5033c699cdc4 (patch) | |
tree | f0c5f0c53fc3346b8671f2a918341a3f08763fd6 /drivers/video/sh_mipi_dsi.c | |
parent | c2658b70f06108361aa5024798f9c1bf47c73374 (diff) |
fbdev: sh_mipi_dsi: fixup setup timing of SYSCONF
SYSCONF should be set after PHYCTRL
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video/sh_mipi_dsi.c')
-rw-r--r-- | drivers/video/sh_mipi_dsi.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/drivers/video/sh_mipi_dsi.c b/drivers/video/sh_mipi_dsi.c index f2c3f945f77b..187e12739b99 100644 --- a/drivers/video/sh_mipi_dsi.c +++ b/drivers/video/sh_mipi_dsi.c | |||
@@ -246,18 +246,6 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi, | |||
246 | /* setup DSI link */ | 246 | /* setup DSI link */ |
247 | 247 | ||
248 | /* | 248 | /* |
249 | * Default = ULPS enable | | ||
250 | * Contention detection enabled | | ||
251 | * EoT packet transmission enable | | ||
252 | * CRC check enable | | ||
253 | * ECC check enable | ||
254 | * additionally enable first two lanes | ||
255 | */ | ||
256 | bitmap_fill((unsigned long *)&tmp, pdata->lane); | ||
257 | tmp |= 0x00003700; | ||
258 | iowrite32(tmp, base + SYSCONF); | ||
259 | |||
260 | /* | ||
261 | * T_wakeup = 0x7000 | 249 | * T_wakeup = 0x7000 |
262 | * T_hs-trail = 3 | 250 | * T_hs-trail = 3 |
263 | * T_hs-prepare = 3 | 251 | * T_hs-prepare = 3 |
@@ -287,6 +275,17 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi, | |||
287 | /* Deassert resets, power on */ | 275 | /* Deassert resets, power on */ |
288 | iowrite32(0x03070001, base + PHYCTRL); | 276 | iowrite32(0x03070001, base + PHYCTRL); |
289 | 277 | ||
278 | /* | ||
279 | * Default = ULPS enable | | ||
280 | * Contention detection enabled | | ||
281 | * EoT packet transmission enable | | ||
282 | * CRC check enable | | ||
283 | * ECC check enable | ||
284 | */ | ||
285 | bitmap_fill((unsigned long *)&tmp, pdata->lane); | ||
286 | tmp |= 0x00003700; | ||
287 | iowrite32(tmp, base + SYSCONF); | ||
288 | |||
290 | /* setup l-bridge */ | 289 | /* setup l-bridge */ |
291 | 290 | ||
292 | /* | 291 | /* |