fbdev: sh_mobile_lcdc: Rename (lcd|num)_cfg (lcd|num)_modes

The struct sh_mobile_lcdc_chan_cfg platform data contains a list of
video modes. Name the lcd_cfg and num_cfg fields to reflect that they
describe video modes.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

5 files changed, 16 insertions, 16 deletions

diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index a87b7f42f120..8cf02e343333 100644
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -211,8 +211,8 @@ 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_modes = ap325rxa_lcdc_modes,
+                .num_modes = ARRAY_SIZE(ap325rxa_lcdc_modes),
                 .panel_cfg = {
                         .width = 152,   /* 7.0 inch */
                         .height = 91,
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 41767451ead1..0b08230546e7 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -1114,8 +1114,8 @@ static int __init arch_setup(void)
                 /* DVI */
                 lcdc_info.clock_source                  = LCDC_CLK_EXTERNAL;
                 lcdc_info.ch[0].clock_divider           = 1;
-                lcdc_info.ch[0].lcd_cfg                 = ecovec_dvi_modes;
-                lcdc_info.ch[0].num_cfg                 = ARRAY_SIZE(ecovec_dvi_modes);
+                lcdc_info.ch[0].lcd_modes               = ecovec_dvi_modes;
+                lcdc_info.ch[0].num_modes               = ARRAY_SIZE(ecovec_dvi_modes);
 
                 gpio_set_value(GPIO_PTA2, 1);
                 gpio_set_value(GPIO_PTU1, 1);
@@ -1123,8 +1123,8 @@ static int __init arch_setup(void)
                 /* Panel */
                 lcdc_info.clock_source                  = LCDC_CLK_PERIPHERAL;
                 lcdc_info.ch[0].clock_divider           = 2;
-                lcdc_info.ch[0].lcd_cfg                 = ecovec_lcd_modes;
-                lcdc_info.ch[0].num_cfg                 = ARRAY_SIZE(ecovec_lcd_modes);
+                lcdc_info.ch[0].lcd_modes               = ecovec_lcd_modes;
+                lcdc_info.ch[0].num_modes               = ARRAY_SIZE(ecovec_lcd_modes);
 
                 gpio_set_value(GPIO_PTR1, 1);
 
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index 77d5a60d64fd..d04a55d3b877 100644
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -148,8 +148,8 @@ static struct sh_mobile_lcdc_info kfr2r09_sh_lcdc_info = {
                 .interface_type = SYS18,
                 .clock_divider = 6,
                 .flags = LCDC_FLAGS_DWPOL,
-                .lcd_cfg = kfr2r09_lcdc_modes,
-                .num_cfg = ARRAY_SIZE(kfr2r09_lcdc_modes),
+                .lcd_modes = kfr2r09_lcdc_modes,
+                .num_modes = ARRAY_SIZE(kfr2r09_lcdc_modes),
                 .panel_cfg = {
                         .width = 35,
                         .height = 58,
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 93a1c9109abc..ff6f69c6906e 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -246,8 +246,8 @@ static struct sh_mobile_lcdc_info sh_mobile_lcdc_info = {
                 .fourcc = V4L2_PIX_FMT_RGB565,
                 .interface_type = RGB16,
                 .clock_divider = 2,
-                .lcd_cfg = migor_lcd_modes,
-                .num_cfg = ARRAY_SIZE(migor_lcd_modes),
+                .lcd_modes = migor_lcd_modes,
+                .num_modes = ARRAY_SIZE(migor_lcd_modes),
                 .panel_cfg = { /* 7.0 inch */
                         .width = 152,
                         .height = 91,
@@ -260,8 +260,8 @@ static struct sh_mobile_lcdc_info sh_mobile_lcdc_info = {
                 .fourcc = V4L2_PIX_FMT_RGB565,
                 .interface_type = SYS16A,
                 .clock_divider = 10,
-                .lcd_cfg = migor_lcd_modes,
-                .num_cfg = ARRAY_SIZE(migor_lcd_modes),
+                .lcd_modes = migor_lcd_modes,
+                .num_modes = ARRAY_SIZE(migor_lcd_modes),
                 .panel_cfg = {
                         .width = 49,    /* 2.4 inch */
                         .height = 37,
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index a468398bfb34..9bf528b4ae21 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -886,12 +886,12 @@ static int __init devices_setup(void)
 
         if (sw & SW41_B) {
                 /* 720p */
-                lcdc_info.ch[0].lcd_cfg = lcdc_720p_modes;
-                lcdc_info.ch[0].num_cfg = ARRAY_SIZE(lcdc_720p_modes);
+                lcdc_info.ch[0].lcd_modes = lcdc_720p_modes;
+                lcdc_info.ch[0].num_modes = ARRAY_SIZE(lcdc_720p_modes);
         } else {
                 /* VGA */
-                lcdc_info.ch[0].lcd_cfg = lcdc_vga_modes;
-                lcdc_info.ch[0].num_cfg = ARRAY_SIZE(lcdc_vga_modes);
+                lcdc_info.ch[0].lcd_modes = lcdc_vga_modes;
+                lcdc_info.ch[0].num_modes = ARRAY_SIZE(lcdc_vga_modes);
         }
 
         if (sw & SW41_A) {