Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d67b89c authored by Peter Korsgaard's avatar Peter Korsgaard Committed by Florian Tobias Schandinat
Browse files

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: default avatarPeter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent acfdc2e1

drivers/video/atmel_lcdfb.c

+24 −8
Original line number Diff line number Diff line
@@ -684,6 +684,9 @@ static int atmel_lcdfb_setcolreg(unsigned int regno, unsigned int red, 


	case FB_VISUAL_PSEUDOCOLOR:

		if (regno < 256) {

			if (cpu_is_at91sam9261() || cpu_is_at91sam9263()

			    || cpu_is_at91sam9rl()) {

				/* old style I+BGR:555 */

				val  = ((red   >> 11) & 0x001f);

				val |= ((green >>  6) & 0x03e0);

				val |= ((blue  >>  1) & 0x7c00);
@@ -692,6 +695,19 @@ static int atmel_lcdfb_setcolreg(unsigned int regno, unsigned int red, 
				 * TODO: intensity bit. Maybe something like

				 *   ~(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);

			ret = 0;