summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-01-19 21:13:33 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-02-19 11:08:59 +0000
commit9c49e4ab84dd46769e7fd9773946e10c95bab680 (patch)
treed26b1c57d5e3bf3dac55db0ce123f2314740ada6
parentff6433225b08d74f77f6eb4c5bf5ca434a371492 (diff)
downloadop-kernel-dev-9c49e4ab84dd46769e7fd9773946e10c95bab680.zip
op-kernel-dev-9c49e4ab84dd46769e7fd9773946e10c95bab680.tar.gz
ARM: clcd: use amba_part() to determine if we have a PL110 primecell
Instead of matching the entire peripheral ID, match against just the part number using the amba_xxx() macros. Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--include/linux/amba/clcd.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/amba/clcd.h b/include/linux/amba/clcd.h
index be33b3a..2e51121 100644
--- a/include/linux/amba/clcd.h
+++ b/include/linux/amba/clcd.h
@@ -212,12 +212,12 @@ static inline void clcdfb_decode(struct clcd_fb *fb, struct clcd_regs *regs)
break;
case 16:
/*
- * PL110 cannot choose between 5551 and 565 modes in
- * its control register
+ * PL110 cannot choose between 5551 and 565 modes in its
+ * control register. It is possible to use 565 with
+ * custom external wiring.
*/
- if ((fb->dev->periphid & 0x000fffff) == 0x00041110)
- val |= CNTL_LCDBPP16;
- else if (fb->fb.var.green.length == 5)
+ if (amba_part(fb->dev) == 0x110 ||
+ fb->fb.var.green.length == 5)
val |= CNTL_LCDBPP16;
else
val |= CNTL_LCDBPP16_565;
OpenPOWER on IntegriCloud