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

Commit 9728c1b6 authored by Russell King's avatar Russell King
Browse files

ARM: versatile: support CLCD RGB565 layout with blue LSB 



RGB565 with blue in the LSB wasn't supported.  Add support for this
layout.

Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 95c34f83

arch/arm/mach-versatile/core.c

+16 −3
Original line number Diff line number Diff line
@@ -630,18 +630,22 @@ static void versatile_clcd_disable(struct clcd_fb *fb) 
 */

static void versatile_clcd_enable(struct clcd_fb *fb)

{

	struct fb_var_screeninfo *var = &fb->fb.var;

	void __iomem *sys_clcd = __io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_CLCD_OFFSET;

	u32 val;



	val = readl(sys_clcd);

	val &= ~SYS_CLCD_MODE_MASK;



	switch (fb->fb.var.green.length) {

	switch (var->green.length) {

	case 5:

		val |= SYS_CLCD_MODE_5551;

		break;

	case 6:

		if (var->red.offset == 0)

			val |= SYS_CLCD_MODE_565_RLSB;

		else

			val |= SYS_CLCD_MODE_565_BLSB;

		break;

	case 8:

		val |= SYS_CLCD_MODE_888;
@@ -709,10 +713,19 @@ static void versatile_clcd_remove(struct clcd_fb *fb) 
			      fb->fb.screen_base, fb->fb.fix.smem_start);

}



static void versatile_clcd_decode(struct clcd_fb *fb, struct clcd_regs *regs)

{

	clcdfb_decode(fb, regs);



	/* Always clear BGR for RGB565: we do the routing externally */

	if (fb->fb.var.green.length == 6)

		regs->cntl &= ~CNTL_BGR;

}



static struct clcd_board clcd_plat_data = {

	.name		= "Versatile",

	.check		= clcdfb_check,

	.decode		= clcdfb_decode,

	.decode		= versatile_clcd_decode,

	.disable	= versatile_clcd_disable,

	.enable		= versatile_clcd_enable,

	.setup		= versatile_clcd_setup,