summaryrefslogtreecommitdiffstats
path: root/include/linux/amba
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-08-17 22:13:22 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-08-17 22:15:09 +0100
commit99c796df94afca5256860dd4760017f1dbb3480c (patch)
tree73347ec30626e2ebdf95f64d1cd195b11baa794e /include/linux/amba
parent41e2e8fd34fff909a0e40129f6ac4233ecfa67a9 (diff)
downloadop-kernel-dev-99c796df94afca5256860dd4760017f1dbb3480c.zip
op-kernel-dev-99c796df94afca5256860dd4760017f1dbb3480c.tar.gz
VIDEO: amba clcd: don't disable an already disabled clock
Fix the clock enable/disable tracking in the AMBA CLCD driver so that the driver doesn't try to disable an already disabled clock, thereby causing the clock (if shared) to become unbalanced. This resolves a problem with CLCD on LPC32xx ARM platforms. Reported-by: Kevin Wells <wellsk40@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/linux/amba')
-rw-r--r--include/linux/amba/clcd.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/amba/clcd.h b/include/linux/amba/clcd.h
index ca16c38..be33b3a 100644
--- a/include/linux/amba/clcd.h
+++ b/include/linux/amba/clcd.h
@@ -150,6 +150,7 @@ struct clcd_fb {
u16 off_cntl;
u32 clcd_cntl;
u32 cmap[16];
+ bool clk_enabled;
};
static inline void clcdfb_decode(struct clcd_fb *fb, struct clcd_regs *regs)
OpenPOWER on IntegriCloud