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

Commit 16478b61 authored by Linus Walleij's avatar Linus Walleij Committed by Olof Johansson
Browse files

ARM/fb: ep93xx: switch framebuffer to use modedb only 



All the EP93xx boards exclusively use modedb to look up video
modes from the command line. Root out the parametrization of
custom video modes from the platform data and board files
and simplify the driver.

Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent d330615b

arch/arm/mach-ep93xx/edb93xx.c

+0 −2
Original line number Diff line number Diff line
@@ -205,8 +205,6 @@ static void __init edb93xx_register_pwm(void) 
 * EDB93xx framebuffer

 *************************************************************************/

static struct ep93xxfb_mach_info __initdata edb93xxfb_info = {

	.num_modes	= EP93XXFB_USE_MODEDB,

	.bpp		= 16,

	.flags		= 0,

};

arch/arm/mach-ep93xx/simone.c

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ static struct ep93xx_eth_data __initdata simone_eth_data = { 
};



static struct ep93xxfb_mach_info __initdata simone_fb_info = {

	.num_modes	= EP93XXFB_USE_MODEDB,

	.bpp		= 16,

	.flags		= EP93XXFB_USE_SDCSN0 | EP93XXFB_PCLK_FALLING,

};

arch/arm/mach-ep93xx/snappercl15.c

+0 −2
Original line number Diff line number Diff line
@@ -144,8 +144,6 @@ static struct i2c_board_info __initdata snappercl15_i2c_data[] = { 
};



static struct ep93xxfb_mach_info __initdata snappercl15_fb_info = {

	.num_modes		= EP93XXFB_USE_MODEDB,

	.bpp			= 16,

};



static struct platform_device snappercl15_audio_device = {

arch/arm/mach-ep93xx/vision_ep9307.c

+0 −2
Original line number Diff line number Diff line
@@ -106,8 +106,6 @@ static void vision_lcd_blank(int blank_mode, struct fb_info *info) 
}



static struct ep93xxfb_mach_info ep93xxfb_info __initdata = {

	.num_modes	= EP93XXFB_USE_MODEDB,

	.bpp		= 16,

	.flags		= EP93XXFB_USE_SDCSN0 | EP93XXFB_PCLK_FALLING,

	.setup		= vision_lcd_setup,

	.teardown	= vision_lcd_teardown,

drivers/video/fbdev/ep93xx-fb.c

+4 −26
Original line number Diff line number Diff line
@@ -419,36 +419,15 @@ static struct fb_ops ep93xxfb_ops = { 
	.fb_mmap	= ep93xxfb_mmap,

};



static int ep93xxfb_calc_fbsize(struct ep93xxfb_mach_info *mach_info)

{

	int i, fb_size = 0;



	if (mach_info->num_modes == EP93XXFB_USE_MODEDB) {

		fb_size = EP93XXFB_MAX_XRES * EP93XXFB_MAX_YRES *

			mach_info->bpp / 8;

	} else {

		for (i = 0; i < mach_info->num_modes; i++) {

			const struct fb_videomode *mode;

			int size;



			mode = &mach_info->modes[i];

			size = mode->xres * mode->yres * mach_info->bpp / 8;

			if (size > fb_size)

				fb_size = size;

		}

	}



	return fb_size;

}



static int ep93xxfb_alloc_videomem(struct fb_info *info)

{

	struct ep93xx_fbi *fbi = info->par;

	char __iomem *virt_addr;

	dma_addr_t phys_addr;

	unsigned int fb_size;



	fb_size = ep93xxfb_calc_fbsize(fbi->mach_info);

	/* Maximum 16bpp -> used memory is maximum x*y*2 bytes */

	fb_size = EP93XXFB_MAX_XRES * EP93XXFB_MAX_YRES * 2;



	virt_addr = dma_alloc_writecombine(info->dev, fb_size,

					   &phys_addr, GFP_KERNEL);

	if (!virt_addr)
@@ -550,8 +529,7 @@ static int ep93xxfb_probe(struct platform_device *pdev) 


	fb_get_options("ep93xx-fb", &video_mode);

	err = fb_find_mode(&info->var, info, video_mode,

			   fbi->mach_info->modes, fbi->mach_info->num_modes,

			   fbi->mach_info->default_mode, fbi->mach_info->bpp);

			   NULL, 0, NULL, 16);

	if (err == 0) {

		dev_err(info->dev, "No suitable video mode found\n");

		err = -EINVAL;