Merge branch 'kvm-updates/3.4' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[cascardo/linux.git] / arch / sh / boards / mach-ap325rxa / setup.c

diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index ebd0f81..8cf02e3 100644 (file)
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -157,7 +157,7 @@ static struct platform_device nand_flash_device = {
 #define PORT_DRVCRA    0xA405018A
 #define PORT_DRVCRB    0xA405018C
 
-static int ap320_wvga_set_brightness(void *board_data, int brightness)
+static int ap320_wvga_set_brightness(int brightness)
 {
        if (brightness) {
                gpio_set_value(GPIO_PTS3, 0);
@@ -170,12 +170,12 @@ static int ap320_wvga_set_brightness(void *board_data, int brightness)
        return 0;
 }
 
-static int ap320_wvga_get_brightness(void *board_data)
+static int ap320_wvga_get_brightness(void)
 {
        return gpio_get_value(GPIO_PTS3);
 }
 
-static void ap320_wvga_power_on(void *board_data, struct fb_info *info)
+static void ap320_wvga_power_on(void)
 {
        msleep(100);
 
@@ -183,7 +183,7 @@ static void ap320_wvga_power_on(void *board_data, struct fb_info *info)
        __raw_writew(FPGA_LCDREG_VAL, FPGA_LCDREG);
 }
 
-static void ap320_wvga_power_off(void *board_data)
+static void ap320_wvga_power_off(void)
 {
        /* ASD AP-320/325 LCD OFF */
        __raw_writew(0, FPGA_LCDREG);
@@ -211,21 +211,19 @@ static struct sh_mobile_lcdc_info lcdc_info = {
                .fourcc = V4L2_PIX_FMT_RGB565,
                .interface_type = RGB18,
                .clock_divider = 1,
-               .lcd_cfg = ap325rxa_lcdc_modes,
-               .num_cfg = ARRAY_SIZE(ap325rxa_lcdc_modes),
-               .lcd_size_cfg = { /* 7.0 inch */
-                       .width = 152,
+               .lcd_modes = ap325rxa_lcdc_modes,
+               .num_modes = ARRAY_SIZE(ap325rxa_lcdc_modes),
+               .panel_cfg = {
+                       .width = 152,   /* 7.0 inch */
                        .height = 91,
-               },
-               .board_cfg = {
                        .display_on = ap320_wvga_power_on,
                        .display_off = ap320_wvga_power_off,
-                       .set_brightness = ap320_wvga_set_brightness,
-                       .get_brightness = ap320_wvga_get_brightness,
                },
                .bl_info = {
                        .name = "sh_mobile_lcdc_bl",
                        .max_brightness = 1,
+                       .set_brightness = ap320_wvga_set_brightness,
+                       .get_brightness = ap320_wvga_get_brightness,
                },
        }
 };