atmel_lcdfb: support new-style palette format
The newer Atmel SoCs use normal 16bit 565 BGR/RGB for the palette data, rather than the special intensity + 555 format. Fill out palette data correctly on these devices, and at the same time respect the RGB/BGR wiring mode. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
This commit is contained in:
parent
acfdc2e1bd
commit
5d67b89ce8
|
@ -684,14 +684,30 @@ static int atmel_lcdfb_setcolreg(unsigned int regno, unsigned int red,
|
||||||
|
|
||||||
case FB_VISUAL_PSEUDOCOLOR:
|
case FB_VISUAL_PSEUDOCOLOR:
|
||||||
if (regno < 256) {
|
if (regno < 256) {
|
||||||
val = ((red >> 11) & 0x001f);
|
if (cpu_is_at91sam9261() || cpu_is_at91sam9263()
|
||||||
val |= ((green >> 6) & 0x03e0);
|
|| cpu_is_at91sam9rl()) {
|
||||||
val |= ((blue >> 1) & 0x7c00);
|
/* old style I+BGR:555 */
|
||||||
|
val = ((red >> 11) & 0x001f);
|
||||||
|
val |= ((green >> 6) & 0x03e0);
|
||||||
|
val |= ((blue >> 1) & 0x7c00);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* TODO: intensity bit. Maybe something like
|
* TODO: intensity bit. Maybe something like
|
||||||
* ~(red[10] ^ green[10] ^ blue[10]) & 1
|
* ~(red[10] ^ green[10] ^ blue[10]) & 1
|
||||||
*/
|
*/
|
||||||
|
} else {
|
||||||
|
/* new style BGR:565 / RGB:565 */
|
||||||
|
if (sinfo->lcd_wiring_mode ==
|
||||||
|
ATMEL_LCDC_WIRING_RGB) {
|
||||||
|
val = ((blue >> 11) & 0x001f);
|
||||||
|
val |= ((red >> 0) & 0xf800);
|
||||||
|
} else {
|
||||||
|
val = ((red >> 11) & 0x001f);
|
||||||
|
val |= ((blue >> 0) & 0xf800);
|
||||||
|
}
|
||||||
|
|
||||||
|
val |= ((green >> 5) & 0x07e0);
|
||||||
|
}
|
||||||
|
|
||||||
lcdc_writel(sinfo, ATMEL_LCDC_LUT(regno), val);
|
lcdc_writel(sinfo, ATMEL_LCDC_LUT(regno), val);
|
||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
Loading…
Reference in New Issue