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

Commit 934a50bd authored by Johan Hovold's avatar Johan Hovold Committed by Nicolas Ferre
Browse files

atmel_lcdfb: move lcdcon2 register access to compute_hozval 



Pass atmel_lcd_info structure to compute_hozval and only do the register
access on SOCs that actually use it.

This will also simplify the removal of the cpu_is macros.

Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 557b7d5d

drivers/video/atmel_lcdfb.c

+5 −3
Original line number Diff line number Diff line
@@ -193,14 +193,17 @@ static struct fb_fix_screeninfo atmel_lcdfb_fix __initdata = { 
	.accel		= FB_ACCEL_NONE,

};



static unsigned long compute_hozval(unsigned long xres, unsigned long lcdcon2)

static unsigned long compute_hozval(struct atmel_lcdfb_info *sinfo,

							unsigned long xres)

{

	unsigned long lcdcon2;

	unsigned long value;



	if (!(cpu_is_at91sam9261() || cpu_is_at91sam9g10()

		|| cpu_is_at32ap7000()))

		return xres;



	lcdcon2 = lcdc_readl(sinfo, ATMEL_LCDC_LCDCON2);

	value = xres;

	if ((lcdcon2 & ATMEL_LCDC_DISTYPE) != ATMEL_LCDC_DISTYPE_TFT) {

		/* STN display */
@@ -591,8 +594,7 @@ static int atmel_lcdfb_set_par(struct fb_info *info) 
	lcdc_writel(sinfo, ATMEL_LCDC_TIM2, value);



	/* Horizontal value (aka line size) */

	hozval_linesz = compute_hozval(info->var.xres,

					lcdc_readl(sinfo, ATMEL_LCDC_LCDCON2));

	hozval_linesz = compute_hozval(sinfo, info->var.xres);



	/* Display size */

	value = (hozval_linesz - 1) << ATMEL_LCDC_HOZVAL_OFFSET;