Module Name: src
Committed By: kiyohara
Date: Sun Aug 8 09:33:36 UTC 2010
Modified Files:
src/sys/arch/arm/xscale: pxa2x0_lcd.c
Log Message:
Must disable LCD Controller in pxa2x0_lcd_attach_sub(), if already enabled.
We wait to become disable LCD in pxa2x0_lcd_initialize().
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/xscale/pxa2x0_lcd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/xscale/pxa2x0_lcd.c
diff -u src/sys/arch/arm/xscale/pxa2x0_lcd.c:1.28 src/sys/arch/arm/xscale/pxa2x0_lcd.c:1.29
--- src/sys/arch/arm/xscale/pxa2x0_lcd.c:1.28 Sat Mar 13 11:15:52 2010
+++ src/sys/arch/arm/xscale/pxa2x0_lcd.c Sun Aug 8 09:33:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_lcd.c,v 1.28 2010/03/13 11:15:52 bsh Exp $ */
+/* $NetBSD: pxa2x0_lcd.c,v 1.29 2010/08/08 09:33:35 kiyohara Exp $ */
/*
* Copyright (c) 2002 Genetec Corporation. All rights reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c,v 1.28 2010/03/13 11:15:52 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c,v 1.29 2010/08/08 09:33:35 kiyohara Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -249,6 +249,9 @@
return;
}
+ /* Must disable LCD Controller here, if already enabled. */
+ bus_space_write_4(iot, ioh, LCDC_LCCR0, 0);
+
pxa2x0_lcd_initialize(sc, geom);
#if NWSDISPLAY > 0
