diff options
| author | Jon Medhurst <tixy@linaro.org> | 2014-04-15 11:46:12 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2014-04-15 11:46:12 +0100 |
| commit | c5b90d4f2eaa3803eb5437a4ec034c4476bc576c (patch) | |
| tree | dc12d5d9deb09ab02998dae16bc3bfdc76584863 /include/linux | |
| parent | 98ab9255d5f7c283d9addedae459da211209f007 (diff) | |
| parent | b764a2b5f6fc0a87834c20ecf358c2c3a90e2e4c (diff) | |
Merge branch 'tracking-armlt-clcd' into integration-linaro-vexpress
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/amba/clcd.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/amba/clcd.h b/include/linux/amba/clcd.h index e82e3ee2c54..4a53250f970 100644 --- a/include/linux/amba/clcd.h +++ b/include/linux/amba/clcd.h @@ -243,6 +243,9 @@ static inline void clcdfb_decode(struct clcd_fb *fb, struct clcd_regs *regs) val |= CNTL_BGR; } + /* Reset the current colour depth */ + val &= ~CNTL_LCDBPP16_444; + switch (var->bits_per_pixel) { case 1: val |= CNTL_LCDBPP1; @@ -264,14 +267,15 @@ static inline void clcdfb_decode(struct clcd_fb *fb, struct clcd_regs *regs) */ if (amba_part(fb->dev) == 0x110 || var->green.length == 5) - val |= CNTL_LCDBPP16; + val |= CNTL_LCDBPP16 | CNTL_BGR; else if (var->green.length == 6) - val |= CNTL_LCDBPP16_565; + val |= CNTL_LCDBPP16_565 | CNTL_BGR; else - val |= CNTL_LCDBPP16_444; + val |= CNTL_LCDBPP16_444 | CNTL_BGR; break; case 32: val |= CNTL_LCDBPP24; + val &= ~CNTL_BGR; break; } |