diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-03-28 00:53:10 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-03-28 00:53:10 -0400 |
commit | 18af30e259c25a64ad69bb749c661564bc886275 (patch) | |
tree | 996c89594fd20f25fcc15b5843625d99473f6982 /arch/sh/boards/mach-ecovec24/setup.c | |
parent | 691c01c3f0b3252308162de90edcd02f7ca1733c (diff) | |
parent | 6658a6991cef75719a21441aa0b7f8d6821534ee (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Diffstat (limited to 'arch/sh/boards/mach-ecovec24/setup.c')
-rw-r--r-- | arch/sh/boards/mach-ecovec24/setup.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index cde7c0085ced..e5ac12b2ce65 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c | |||
@@ -310,14 +310,14 @@ static const struct fb_videomode ecovec_dvi_modes[] = { | |||
310 | }, | 310 | }, |
311 | }; | 311 | }; |
312 | 312 | ||
313 | static int ecovec24_set_brightness(void *board_data, int brightness) | 313 | static int ecovec24_set_brightness(int brightness) |
314 | { | 314 | { |
315 | gpio_set_value(GPIO_PTR1, brightness); | 315 | gpio_set_value(GPIO_PTR1, brightness); |
316 | 316 | ||
317 | return 0; | 317 | return 0; |
318 | } | 318 | } |
319 | 319 | ||
320 | static int ecovec24_get_brightness(void *board_data) | 320 | static int ecovec24_get_brightness(void) |
321 | { | 321 | { |
322 | return gpio_get_value(GPIO_PTR1); | 322 | return gpio_get_value(GPIO_PTR1); |
323 | } | 323 | } |
@@ -327,17 +327,15 @@ static struct sh_mobile_lcdc_info lcdc_info = { | |||
327 | .interface_type = RGB18, | 327 | .interface_type = RGB18, |
328 | .chan = LCDC_CHAN_MAINLCD, | 328 | .chan = LCDC_CHAN_MAINLCD, |
329 | .fourcc = V4L2_PIX_FMT_RGB565, | 329 | .fourcc = V4L2_PIX_FMT_RGB565, |
330 | .lcd_size_cfg = { /* 7.0 inch */ | 330 | .panel_cfg = { /* 7.0 inch */ |
331 | .width = 152, | 331 | .width = 152, |
332 | .height = 91, | 332 | .height = 91, |
333 | }, | 333 | }, |
334 | .board_cfg = { | ||
335 | .set_brightness = ecovec24_set_brightness, | ||
336 | .get_brightness = ecovec24_get_brightness, | ||
337 | }, | ||
338 | .bl_info = { | 334 | .bl_info = { |
339 | .name = "sh_mobile_lcdc_bl", | 335 | .name = "sh_mobile_lcdc_bl", |
340 | .max_brightness = 1, | 336 | .max_brightness = 1, |
337 | .set_brightness = ecovec24_set_brightness, | ||
338 | .get_brightness = ecovec24_get_brightness, | ||
341 | }, | 339 | }, |
342 | } | 340 | } |
343 | }; | 341 | }; |
@@ -769,7 +767,9 @@ static struct platform_device camera_devices[] = { | |||
769 | 767 | ||
770 | /* FSI */ | 768 | /* FSI */ |
771 | static struct sh_fsi_platform_info fsi_info = { | 769 | static struct sh_fsi_platform_info fsi_info = { |
772 | .portb_flags = SH_FSI_BRS_INV, | 770 | .port_b = { |
771 | .flags = SH_FSI_BRS_INV, | ||
772 | }, | ||
773 | }; | 773 | }; |
774 | 774 | ||
775 | static struct resource fsi_resources[] = { | 775 | static struct resource fsi_resources[] = { |
@@ -1116,8 +1116,8 @@ static int __init arch_setup(void) | |||
1116 | /* DVI */ | 1116 | /* DVI */ |
1117 | lcdc_info.clock_source = LCDC_CLK_EXTERNAL; | 1117 | lcdc_info.clock_source = LCDC_CLK_EXTERNAL; |
1118 | lcdc_info.ch[0].clock_divider = 1; | 1118 | lcdc_info.ch[0].clock_divider = 1; |
1119 | lcdc_info.ch[0].lcd_cfg = ecovec_dvi_modes; | 1119 | lcdc_info.ch[0].lcd_modes = ecovec_dvi_modes; |
1120 | lcdc_info.ch[0].num_cfg = ARRAY_SIZE(ecovec_dvi_modes); | 1120 | lcdc_info.ch[0].num_modes = ARRAY_SIZE(ecovec_dvi_modes); |
1121 | 1121 | ||
1122 | gpio_set_value(GPIO_PTA2, 1); | 1122 | gpio_set_value(GPIO_PTA2, 1); |
1123 | gpio_set_value(GPIO_PTU1, 1); | 1123 | gpio_set_value(GPIO_PTU1, 1); |
@@ -1125,8 +1125,8 @@ static int __init arch_setup(void) | |||
1125 | /* Panel */ | 1125 | /* Panel */ |
1126 | lcdc_info.clock_source = LCDC_CLK_PERIPHERAL; | 1126 | lcdc_info.clock_source = LCDC_CLK_PERIPHERAL; |
1127 | lcdc_info.ch[0].clock_divider = 2; | 1127 | lcdc_info.ch[0].clock_divider = 2; |
1128 | lcdc_info.ch[0].lcd_cfg = ecovec_lcd_modes; | 1128 | lcdc_info.ch[0].lcd_modes = ecovec_lcd_modes; |
1129 | lcdc_info.ch[0].num_cfg = ARRAY_SIZE(ecovec_lcd_modes); | 1129 | lcdc_info.ch[0].num_modes = ARRAY_SIZE(ecovec_lcd_modes); |
1130 | 1130 | ||
1131 | gpio_set_value(GPIO_PTR1, 1); | 1131 | gpio_set_value(GPIO_PTR1, 1); |
1132 | 1132 | ||