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

Commit b7d2d372 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Tomi Valkeinen
Browse files

video: imxfb: Remove unused fields from platform data structure 



Some fields in platform data structure is never used by boards.
This patch removes these fields and as a result optimizes private
driver structure a bit. Additionally patch removes backligh_power()
callback, so if it will be needed in the future, this feature should
be added as pwm{gpio,etc.}-regulator to the board code or in the DTS.

Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 2516ae8a

drivers/video/imxfb.c

+17 −47
Original line number Diff line number Diff line
@@ -156,11 +156,8 @@ struct imxfb_info { 
	 * the framebuffer memory region to.

	 */

	dma_addr_t		map_dma;

	u_char			*map_cpu;

	u_int			map_size;



	u_char			*screen_cpu;

	dma_addr_t		screen_dma;

	u_int			palette_size;



	dma_addr_t		dbar1;
@@ -170,9 +167,8 @@ struct imxfb_info { 
	u_int			pwmr;

	u_int			lscr1;

	u_int			dmacr;

	u_int			cmap_inverse:1,

				cmap_static:1,

				unused:30;

	bool			cmap_inverse;

	bool			cmap_static;



	struct imx_fb_videomode *mode;

	int			num_modes;
@@ -180,8 +176,6 @@ struct imxfb_info { 
	struct backlight_device *bl;

#endif



	void (*backlight_power)(int);



	struct regulator	*lcd_pwr;

};
@@ -573,7 +567,7 @@ static void imxfb_enable_controller(struct imxfb_info *fbi) 


	pr_debug("Enabling LCD controller\n");



	writel(fbi->screen_dma, fbi->regs + LCDC_SSA);

	writel(fbi->map_dma, fbi->regs + LCDC_SSA);



	/* panning offset 0 (0 pixel offset)        */

	writel(0x00000000, fbi->regs + LCDC_POS);
@@ -592,9 +586,6 @@ static void imxfb_enable_controller(struct imxfb_info *fbi) 
	clk_prepare_enable(fbi->clk_ahb);

	clk_prepare_enable(fbi->clk_per);

	fbi->enabled = true;



	if (fbi->backlight_power)

		fbi->backlight_power(1);

}



static void imxfb_disable_controller(struct imxfb_info *fbi)
@@ -604,9 +595,6 @@ static void imxfb_disable_controller(struct imxfb_info *fbi) 


	pr_debug("Disabling LCD controller\n");



	if (fbi->backlight_power)

		fbi->backlight_power(0);



	clk_disable_unprepare(fbi->clk_per);

	clk_disable_unprepare(fbi->clk_ipg);

	clk_disable_unprepare(fbi->clk_ahb);
@@ -790,13 +778,9 @@ static int imxfb_init_fbinfo(struct platform_device *pdev) 
	info->flags			= FBINFO_FLAG_DEFAULT |

					  FBINFO_READS_FAST;

	if (pdata) {

		info->var.grayscale		= pdata->cmap_greyscale;

		fbi->cmap_inverse		= pdata->cmap_inverse;

		fbi->cmap_static		= pdata->cmap_static;

		fbi->lscr1			= pdata->lscr1;

		fbi->dmacr			= pdata->dmacr;

		fbi->pwmr			= pdata->pwmr;

		fbi->backlight_power		= pdata->backlight_power;

	} else {

		np = pdev->dev.of_node;

		info->var.grayscale = of_property_read_bool(np,
@@ -808,8 +792,6 @@ static int imxfb_init_fbinfo(struct platform_device *pdev) 
		of_property_read_u32(np, "fsl,lscr1", &fbi->lscr1);



		of_property_read_u32(np, "fsl,dmacr", &fbi->dmacr);



		fbi->backlight_power = NULL;

	}



	return 0;
@@ -1003,31 +985,17 @@ static int imxfb_probe(struct platform_device *pdev) 
		goto failed_ioremap;

	}



	/* Seems not being used by anyone, so no support for oftree */

	if (!pdata || !pdata->fixed_screen_cpu) {

	fbi->map_size = PAGE_ALIGN(info->fix.smem_len);

		fbi->map_cpu = dma_alloc_writecombine(&pdev->dev,

				fbi->map_size, &fbi->map_dma, GFP_KERNEL);

	info->screen_base = dma_alloc_writecombine(&pdev->dev, fbi->map_size,

						   &fbi->map_dma, GFP_KERNEL);



		if (!fbi->map_cpu) {

	if (!info->screen_base) {

		dev_err(&pdev->dev, "Failed to allocate video RAM: %d\n", ret);

		ret = -ENOMEM;

		goto failed_map;

	}



		info->screen_base = fbi->map_cpu;

		fbi->screen_cpu = fbi->map_cpu;

		fbi->screen_dma = fbi->map_dma;

		info->fix.smem_start = fbi->screen_dma;

	} else {

		/* Fixed framebuffer mapping enables location of the screen in eSRAM */

		fbi->map_cpu = pdata->fixed_screen_cpu;

		fbi->map_dma = pdata->fixed_screen_dma;

		info->screen_base = fbi->map_cpu;

		fbi->screen_cpu = fbi->map_cpu;

		fbi->screen_dma = fbi->map_dma;

		info->fix.smem_start = fbi->screen_dma;

	}

	info->fix.smem_start = fbi->map_dma;



	if (pdata && pdata->init) {

		ret = pdata->init(fbi->pdev);
@@ -1087,8 +1055,7 @@ static int imxfb_probe(struct platform_device *pdev) 
	if (pdata && pdata->exit)

		pdata->exit(fbi->pdev);

failed_platform_init:

	if (pdata && !pdata->fixed_screen_cpu)

		dma_free_writecombine(&pdev->dev,fbi->map_size,fbi->map_cpu,

	dma_free_writecombine(&pdev->dev, fbi->map_size, info->screen_base,

			      fbi->map_dma);

failed_map:

	iounmap(fbi->regs);
@@ -1127,6 +1094,9 @@ static int imxfb_remove(struct platform_device *pdev) 
	kfree(info->pseudo_palette);

	framebuffer_release(info);



	dma_free_writecombine(&pdev->dev, fbi->map_size, info->screen_base,

			      fbi->map_dma);



	iounmap(fbi->regs);

	release_mem_region(res->start, resource_size(res));

include/linux/platform_data/video-imxfb.h

+0 −10
Original line number Diff line number Diff line
@@ -61,22 +61,12 @@ struct imx_fb_platform_data { 
	struct imx_fb_videomode *mode;

	int		num_modes;



	u_int		cmap_greyscale:1,

			cmap_inverse:1,

			cmap_static:1,

			unused:29;



	u_int		pwmr;

	u_int		lscr1;

	u_int		dmacr;



	u_char * fixed_screen_cpu;

	dma_addr_t fixed_screen_dma;



	int (*init)(struct platform_device *);

	void (*exit)(struct platform_device *);



	void (*backlight_power)(int);

};



#endif /* ifndef __MACH_IMXFB_H__ */