diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-09-11 22:59:04 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-03-12 22:40:50 +0100 |
| commit | afaad83b9c0d24eac88535cc5a8c6019f0c45bcb (patch) | |
| tree | 8f96bd7ac14c07f89178372782c7707f625bb193 /arch/arm/mach-shmobile | |
| parent | 43059b0f46f814b4152f327c701d079253904540 (diff) | |
| download | blackbird-op-linux-afaad83b9c0d24eac88535cc5a8c6019f0c45bcb.tar.gz blackbird-op-linux-afaad83b9c0d24eac88535cc5a8c6019f0c45bcb.zip | |
fbdev: sh_mobile_lcdc: Merge board_cfg and lcd_size_cfg into panel_cfg
Update board code accordingly.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/board-ag5evm.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/board-ap4evb.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/board-bonito.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 6 |
4 files changed, 12 insertions, 10 deletions
diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c index 7108c5da6077..199b3b958f42 100644 --- a/arch/arm/mach-shmobile/board-ag5evm.c +++ b/arch/arm/mach-shmobile/board-ag5evm.c @@ -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, }, diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index 22e192574625..2cb6c39dd62a 100644 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c @@ -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); diff --git a/arch/arm/mach-shmobile/board-bonito.c b/arch/arm/mach-shmobile/board-bonito.c index 4d2201622323..9cd9408b851b 100644 --- a/arch/arm/mach-shmobile/board-bonito.c +++ b/arch/arm/mach-shmobile/board-bonito.c @@ -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, }, diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 123232329a88..9228cc555b46 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -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, |
