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

Commit afaad83b authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

fbdev: sh_mobile_lcdc: Merge board_cfg and lcd_size_cfg into panel_cfg 



Update board code accordingly.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent 43059b0f

arch/arm/mach-shmobile/board-ag5evm.c

+3 −3
Original line number Diff line number Diff line
@@ -252,12 +252,12 @@ static struct sh_mobile_lcdc_info lcdc0_info = { 
		.interface_type = RGB24,

		.clock_divider = 1,

		.flags = LCDC_FLAGS_DWPOL,

		.lcd_size_cfg.width = 44,

		.lcd_size_cfg.height = 79,

		.fourcc = V4L2_PIX_FMT_RGB565,

		.lcd_cfg = lcdc0_modes,

		.num_cfg = ARRAY_SIZE(lcdc0_modes),

		.board_cfg = {

		.panel_cfg = {

			.width = 44,

			.height = 79,

			.display_on = lcd_backlight_on,

			.display_off = lcd_backlight_reset,

		},

arch/arm/mach-shmobile/board-ap4evb.c

+4 −4
Original line number Diff line number Diff line
@@ -1360,8 +1360,8 @@ static void __init ap4evb_init(void) 
	lcdc_info.ch[0].interface_type		= RGB24;

	lcdc_info.ch[0].clock_divider		= 1;

	lcdc_info.ch[0].flags			= LCDC_FLAGS_DWPOL;

	lcdc_info.ch[0].lcd_size_cfg.width	= 44;

	lcdc_info.ch[0].lcd_size_cfg.height	= 79;

	lcdc_info.ch[0].panel_cfg.width		= 44;

	lcdc_info.ch[0].panel_cfg.height	= 79;



	platform_add_devices(qhd_devices, ARRAY_SIZE(qhd_devices));
@@ -1402,8 +1402,8 @@ static void __init ap4evb_init(void) 
	lcdc_info.ch[0].interface_type		= RGB18;

	lcdc_info.ch[0].clock_divider		= 3;

	lcdc_info.ch[0].flags			= 0;

	lcdc_info.ch[0].lcd_size_cfg.width	= 152;

	lcdc_info.ch[0].lcd_size_cfg.height	= 91;

	lcdc_info.ch[0].panel_cfg.width		= 152;

	lcdc_info.ch[0].panel_cfg.height	= 91;



	/* enable TouchScreen */

	irq_set_irq_type(IRQ7, IRQ_TYPE_LEVEL_LOW);

arch/arm/mach-shmobile/board-bonito.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static struct sh_mobile_lcdc_info lcdc0_info = { 
		.flags			= 0,

		.lcd_cfg		= &lcdc0_mode,

		.num_cfg		= 1,

		.lcd_size_cfg = {

		.panel_cfg = {

			.width	= 152,

			.height = 91,

		},

arch/arm/mach-shmobile/board-mackerel.c

+4 −2
Original line number Diff line number Diff line
@@ -389,8 +389,10 @@ static struct sh_mobile_lcdc_info lcdc_info = { 
		.interface_type		= RGB24,

		.clock_divider		= 3,

		.flags			= 0,

		.lcd_size_cfg.width	= 152,

		.lcd_size_cfg.height	= 91,

		.panel_cfg = {

			.width		= 152,

			.height		= 91,

		},

		.bl_info = {

			.name = "sh_mobile_lcdc_bl",

			.max_brightness = 1,

arch/sh/boards/mach-ap325rxa/setup.c

+2 −4
Original line number Diff line number Diff line
@@ -213,11 +213,9 @@ static struct sh_mobile_lcdc_info lcdc_info = { 
		.clock_divider = 1,

		.lcd_cfg = ap325rxa_lcdc_modes,

		.num_cfg = ARRAY_SIZE(ap325rxa_lcdc_modes),

		.lcd_size_cfg = { /* 7.0 inch */

			.width = 152,

		.panel_cfg = {

			.width = 152,	/* 7.0 inch */

			.height = 91,

		},

		.board_cfg = {

			.display_on = ap320_wvga_power_on,

			.display_off = ap320_wvga_power_off,

		},