projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cfc6a55
)
ARM: pxa168fb: clear enable bit when not active
author
Haojian Zhuang
<
[email protected]
>
Wed, 8 Sep 2010 13:42:39 +0000
(09:42 -0400)
committer
Eric Miao
<
[email protected]
>
Sat, 25 Sep 2010 01:47:04 +0000
(09:47 +0800)
While fb isn't active, we should clear CFG_GRA_ENA bit. The existing code
can't clear this bit.
Signed-off-by: Haojian Zhuang <
[email protected]
>
Acked-by: Marek Vasut <
[email protected]
>
Signed-off-by: Eric Miao <
[email protected]
>
drivers/video/pxa168fb.c
patch
|
blob
|
history
diff --git
a/drivers/video/pxa168fb.c
b/drivers/video/pxa168fb.c
index 5d786bd3e304f1a174e682461d7d94a265ae2119..a31a77ff6f3d2a3ac2daa56baeb6ae55430f6177 100644
(file)
--- a/
drivers/video/pxa168fb.c
+++ b/
drivers/video/pxa168fb.c
@@
-298,8
+298,8
@@
static void set_dma_control0(struct pxa168fb_info *fbi)
* Set bit to enable graphics DMA.
*/
x = readl(fbi->reg_base + LCD_SPU_DMA_CTRL0);
- x
|= fbi->active ? 0x00000100 : 0
;
-
fbi->active = 0
;
+ x
&= ~CFG_GRA_ENA_MASK
;
+
x |= fbi->active ? CFG_GRA_ENA(1) : CFG_GRA_ENA(0)
;
/*
* If we are in a pseudo-color mode, we need to enable