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>
This commit is contained in:
Russell King 2011-01-19 21:13:33 +00:00
parent ff6433225b
commit 9c49e4ab84

View file

@ -212,12 +212,12 @@ static inline void clcdfb_decode(struct clcd_fb *fb, struct clcd_regs *regs)
break; break;
case 16: case 16:
/* /*
* PL110 cannot choose between 5551 and 565 modes in * PL110 cannot choose between 5551 and 565 modes in its
* its control register * control register. It is possible to use 565 with
* custom external wiring.
*/ */
if ((fb->dev->periphid & 0x000fffff) == 0x00041110) if (amba_part(fb->dev) == 0x110 ||
val |= CNTL_LCDBPP16; fb->fb.var.green.length == 5)
else if (fb->fb.var.green.length == 5)
val |= CNTL_LCDBPP16; val |= CNTL_LCDBPP16;
else else
val |= CNTL_LCDBPP16_565; val |= CNTL_LCDBPP16_565;