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>

5 files changed, 8 insertions, 14 deletions

diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index d0d2401c3cbc..a87b7f42f120 100644
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -213,11 +213,9 @@ static struct sh_mobile_lcdc_info lcdc_info = {
                 .clock_divider = 1,
                 .lcd_cfg = ap325rxa_lcdc_modes,
                 .num_cfg = ARRAY_SIZE(ap325rxa_lcdc_modes),
-                .lcd_size_cfg = { /* 7.0 inch */
-                        .width = 152,
+                .panel_cfg = {
+                        .width = 152,   /* 7.0 inch */
                         .height = 91,
-                },
-                .board_cfg = {
                         .display_on = ap320_wvga_power_on,
                         .display_off = ap320_wvga_power_off,
                 },
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 769aab3fa379..41767451ead1 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -327,7 +327,7 @@ static struct sh_mobile_lcdc_info lcdc_info = {
                 .interface_type = RGB18,
                 .chan = LCDC_CHAN_MAINLCD,
                 .fourcc = V4L2_PIX_FMT_RGB565,
-                .lcd_size_cfg = { /* 7.0 inch */
+                .panel_cfg = { /* 7.0 inch */
                         .width = 152,
                         .height = 91,
                 },
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index 5b382e1afaea..77d5a60d64fd 100644
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -150,11 +150,9 @@ static struct sh_mobile_lcdc_info kfr2r09_sh_lcdc_info = {
                 .flags = LCDC_FLAGS_DWPOL,
                 .lcd_cfg = kfr2r09_lcdc_modes,
                 .num_cfg = ARRAY_SIZE(kfr2r09_lcdc_modes),
-                .lcd_size_cfg = {
+                .panel_cfg = {
                         .width = 35,
                         .height = 58,
-                },
-                .board_cfg = {
                         .setup_sys = kfr2r09_lcd_setup,
                         .start_transfer = kfr2r09_lcd_start,
                         .display_on = kfr2r09_lcd_on,
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index d37ba2720527..93a1c9109abc 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -248,7 +248,7 @@ static struct sh_mobile_lcdc_info sh_mobile_lcdc_info = {
                 .clock_divider = 2,
                 .lcd_cfg = migor_lcd_modes,
                 .num_cfg = ARRAY_SIZE(migor_lcd_modes),
-                .lcd_size_cfg = { /* 7.0 inch */
+                .panel_cfg = { /* 7.0 inch */
                         .width = 152,
                         .height = 91,
                 },
@@ -262,11 +262,9 @@ static struct sh_mobile_lcdc_info sh_mobile_lcdc_info = {
                 .clock_divider = 10,
                 .lcd_cfg = migor_lcd_modes,
                 .num_cfg = ARRAY_SIZE(migor_lcd_modes),
-                .lcd_size_cfg = { /* 2.4 inch */
-                        .width = 49,
+                .panel_cfg = {
+                        .width = 49,    /* 2.4 inch */
                         .height = 37,
-                },
-                .board_cfg = {
                         .setup_sys = migor_lcd_qvga_setup,
                 },
                 .sys_bus_cfg = {
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 5e25dbe726e2..a468398bfb34 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -182,7 +182,7 @@ static struct sh_mobile_lcdc_info lcdc_info = {
                 .chan = LCDC_CHAN_MAINLCD,
                 .fourcc = V4L2_PIX_FMT_RGB565,
                 .clock_divider = 1,
-                .lcd_size_cfg = { /* 7.0 inch */
+                .panel_cfg = { /* 7.0 inch */
                         .width = 152,
                         .height = 91,
                 },