fbdev: sh_mobile_lcdcfb: Support multiple video modes in platform data

This is a preparation for HDMI hotplug support. This patch just moves all
platform defined video modes for the sh_mobile_lcdcfb driver to separate
arrays and switches all users to use element 0 of that array, so, this patch
doesn't introduce any functional changes and as such should not cause any
regressions.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index e4f6012fe4e3..ce3ed4bc991f 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -989,8 +989,8 @@ static int sh_mobile_lcdc_notify(struct notifier_block *nb,
                         int ret;
 
                         /* Can we handle this display? */
-                        if (var->xres > ch->cfg.lcd_cfg.xres ||
-                            var->yres > ch->cfg.lcd_cfg.yres)
+                        if (var->xres > ch->cfg.lcd_cfg[0].xres ||
+                            var->yres > ch->cfg.lcd_cfg[0].yres)
                                 return -ENOMEM;
 
                         /* Add to the modelist */
@@ -1115,7 +1115,7 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev)
 
                 info = ch->info;
                 var = &info->var;
-                lcd_cfg = &cfg->lcd_cfg;
+                lcd_cfg = &cfg->lcd_cfg[0];
                 info->fbops = &sh_mobile_lcdc_ops;
                 fb_videomode_to_var(var, lcd_cfg);
                 /* Default Y virtual resolution is 2x panel size */
@@ -1187,8 +1187,8 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev)
                          pdev->name,
                          (ch->cfg.chan == LCDC_CHAN_MAINLCD) ?
                          "mainlcd" : "sublcd",
-                         (int) ch->cfg.lcd_cfg.xres,
-                         (int) ch->cfg.lcd_cfg.yres,
+                         (int) ch->cfg.lcd_cfg[0].xres,
+                         (int) ch->cfg.lcd_cfg[0].yres,
                          ch->cfg.bpp);
 
                 /* deferred io mode: disable clock to save power */