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>

diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c
index 199b3b958f4230f9a5a9deff8d49e97e91659e32..33dad1da9310df02c7e7ef4c5bf1afa08b75d242 100644 (file)
--- a/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@ -253,8 +253,8 @@ static struct sh_mobile_lcdc_info lcdc0_info = {
                .clock_divider = 1,
                .flags = LCDC_FLAGS_DWPOL,
                .fourcc = V4L2_PIX_FMT_RGB565,
-               .lcd_cfg = lcdc0_modes,
-               .num_cfg = ARRAY_SIZE(lcdc0_modes),
+               .lcd_modes = lcdc0_modes,
+               .num_modes = ARRAY_SIZE(lcdc0_modes),
                .panel_cfg = {
                        .width = 44,
                        .height = 79,

diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 2cb6c39dd62accf1750c4a4cfbe9c3290a305728..80b94302981549ac08efa04d2aea12278945c6ea 100644 (file)
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -593,8 +593,8 @@ static struct sh_mobile_lcdc_info lcdc_info = {
        .ch[0] = {
                .chan = LCDC_CHAN_MAINLCD,
                .fourcc = V4L2_PIX_FMT_RGB565,
-               .lcd_cfg = ap4evb_lcdc_modes,
-               .num_cfg = ARRAY_SIZE(ap4evb_lcdc_modes),
+               .lcd_modes = ap4evb_lcdc_modes,
+               .num_modes = ARRAY_SIZE(ap4evb_lcdc_modes),
                .meram_cfg = &lcd_meram_cfg,
 #ifdef CONFIG_AP4EVB_QHD
                .tx_dev = &mipidsi0_device,

diff --git a/arch/arm/mach-shmobile/board-bonito.c b/arch/arm/mach-shmobile/board-bonito.c
index 9cd9408b851b2c53d43e4595c79050ca9ebb00f1..fb90f0898d9cab48b787943879ccd69447df03d5 100644 (file)
--- a/arch/arm/mach-shmobile/board-bonito.c
+++ b/arch/arm/mach-shmobile/board-bonito.c
@@ -245,8 +245,8 @@ static struct sh_mobile_lcdc_info lcdc0_info = {
                .interface_type         = RGB24,
                .clock_divider          = 5,
                .flags                  = 0,
-               .lcd_cfg                = &lcdc0_mode,
-               .num_cfg                = 1,
+               .lcd_modes              = &lcdc0_mode,
+               .num_modes              = 1,
                .panel_cfg = {
                        .width  = 152,
                        .height = 91,

diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 9228cc555b46a38568655ae19806a292e5119e6c..aff7df8ccc307901803c52dab09fa9cedf809956 100644 (file)
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -384,8 +384,8 @@ static struct sh_mobile_lcdc_info lcdc_info = {
        .ch[0] = {
                .chan = LCDC_CHAN_MAINLCD,
                .fourcc = V4L2_PIX_FMT_RGB565,
-               .lcd_cfg = mackerel_lcdc_modes,
-               .num_cfg = ARRAY_SIZE(mackerel_lcdc_modes),
+               .lcd_modes = mackerel_lcdc_modes,
+               .num_modes = ARRAY_SIZE(mackerel_lcdc_modes),
                .interface_type         = RGB24,
                .clock_divider          = 3,
                .flags                  = 0,

diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index a87b7f42f1201d26d83396d766285ecd1e46cfd9..8cf02e343333f158dac6a34b800fc9582437f43c 100644 (file)
--- 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 41767451ead14b0ce7fbac4f08051eb35bc8e279..0b08230546e764b18a1260a7d975bd7d90cddeef 100644 (file)
--- 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 77d5a60d64fd438dfa282f4709035939516e13d7..d04a55d3b877a4f7b1d9348486ca52662c91eef4 100644 (file)
--- 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 93a1c9109abce60b2f932558434b1daf13bee44e..ff6f69c6906ec83e3f467b3ea1354f2c13832900 100644 (file)
--- 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 a468398bfb34fd6eed22fd4ff0c60e5688a0cd6f..9bf528b4ae21a12d7d2d270e1931686454db69d8 100644 (file)
--- 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) {

diff --git a/drivers/video/sh_mipi_dsi.c b/drivers/video/sh_mipi_dsi.c
index 5ff3742aeb0820fd9845b248bfc68085ef326807..42ad0f707e88f662866ba3fda11abdebb75502e3 100644 (file)
--- a/drivers/video/sh_mipi_dsi.c
+++ b/drivers/video/sh_mipi_dsi.c
@@ -147,77 +147,77 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
                pctype = 0;
                datatype = MIPI_DSI_PACKED_PIXEL_STREAM_24;
                pixfmt = MIPI_DCS_PIXEL_FMT_24BIT;
-               linelength = ch->lcd_cfg[0].xres * 3;
+               linelength = ch->lcd_modes[0].xres * 3;
                yuv = false;
                break;
        case MIPI_RGB565:
                pctype = 1;
                datatype = MIPI_DSI_PACKED_PIXEL_STREAM_16;
                pixfmt = MIPI_DCS_PIXEL_FMT_16BIT;
-               linelength = ch->lcd_cfg[0].xres * 2;
+               linelength = ch->lcd_modes[0].xres * 2;
                yuv = false;
                break;
        case MIPI_RGB666_LP:
                pctype = 2;
                datatype = MIPI_DSI_PIXEL_STREAM_3BYTE_18;
                pixfmt = MIPI_DCS_PIXEL_FMT_24BIT;
-               linelength = ch->lcd_cfg[0].xres * 3;
+               linelength = ch->lcd_modes[0].xres * 3;
                yuv = false;
                break;
        case MIPI_RGB666:
                pctype = 3;
                datatype = MIPI_DSI_PACKED_PIXEL_STREAM_18;
                pixfmt = MIPI_DCS_PIXEL_FMT_18BIT;
-               linelength = (ch->lcd_cfg[0].xres * 18 + 7) / 8;
+               linelength = (ch->lcd_modes[0].xres * 18 + 7) / 8;
                yuv = false;
                break;
        case MIPI_BGR888:
                pctype = 8;
                datatype = MIPI_DSI_PACKED_PIXEL_STREAM_24;
                pixfmt = MIPI_DCS_PIXEL_FMT_24BIT;
-               linelength = ch->lcd_cfg[0].xres * 3;
+               linelength = ch->lcd_modes[0].xres * 3;
                yuv = false;
                break;
        case MIPI_BGR565:
                pctype = 9;
                datatype = MIPI_DSI_PACKED_PIXEL_STREAM_16;
                pixfmt = MIPI_DCS_PIXEL_FMT_16BIT;
-               linelength = ch->lcd_cfg[0].xres * 2;
+               linelength = ch->lcd_modes[0].xres * 2;
                yuv = false;
                break;
        case MIPI_BGR666_LP:
                pctype = 0xa;
                datatype = MIPI_DSI_PIXEL_STREAM_3BYTE_18;
                pixfmt = MIPI_DCS_PIXEL_FMT_24BIT;
-               linelength = ch->lcd_cfg[0].xres * 3;
+               linelength = ch->lcd_modes[0].xres * 3;
                yuv = false;
                break;
        case MIPI_BGR666:
                pctype = 0xb;
                datatype = MIPI_DSI_PACKED_PIXEL_STREAM_18;
                pixfmt = MIPI_DCS_PIXEL_FMT_18BIT;
-               linelength = (ch->lcd_cfg[0].xres * 18 + 7) / 8;
+               linelength = (ch->lcd_modes[0].xres * 18 + 7) / 8;
                yuv = false;
                break;
        case MIPI_YUYV:
                pctype = 4;
                datatype = MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR16;
                pixfmt = MIPI_DCS_PIXEL_FMT_16BIT;
-               linelength = ch->lcd_cfg[0].xres * 2;
+               linelength = ch->lcd_modes[0].xres * 2;
                yuv = true;
                break;
        case MIPI_UYVY:
                pctype = 5;
                datatype = MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR16;
                pixfmt = MIPI_DCS_PIXEL_FMT_16BIT;
-               linelength = ch->lcd_cfg[0].xres * 2;
+               linelength = ch->lcd_modes[0].xres * 2;
                yuv = true;
                break;
        case MIPI_YUV420_L:
                pctype = 6;
                datatype = MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR12;
                pixfmt = MIPI_DCS_PIXEL_FMT_12BIT;
-               linelength = (ch->lcd_cfg[0].xres * 12 + 7) / 8;
+               linelength = (ch->lcd_modes[0].xres * 12 + 7) / 8;
                yuv = true;
                break;
        case MIPI_YUV420:
@@ -225,7 +225,7 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
                datatype = MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR12;
                pixfmt = MIPI_DCS_PIXEL_FMT_12BIT;
                /* Length of U/V line */
-               linelength = (ch->lcd_cfg[0].xres + 1) / 2;
+               linelength = (ch->lcd_modes[0].xres + 1) / 2;
                yuv = true;
                break;
        default:
@@ -294,7 +294,7 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
         */
        iowrite32(0x00000006, mipi->linkbase + DTCTR);
        /* VSYNC width = 2 (<< 17) */
-       iowrite32((ch->lcd_cfg[0].vsync_len << pdata->vsynw_offset) |
+       iowrite32((ch->lcd_modes[0].vsync_len << pdata->vsynw_offset) |
                  (pdata->clksrc << 16) | (pctype << 12) | datatype,
                  mipi->linkbase + VMCTR1);
 
@@ -328,7 +328,7 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
        top = linelength << 16; /* RGBLEN */
        bottom = 0x00000001;
        if (pdata->flags & SH_MIPI_DSI_HSABM) /* HSALEN */
-               bottom = (pdata->lane * ch->lcd_cfg[0].hsync_len) - 10;
+               bottom = (pdata->lane * ch->lcd_modes[0].hsync_len) - 10;
        iowrite32(top | bottom , mipi->linkbase + VMLEN1);
 
        /*
@@ -348,18 +348,18 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
                div = 2;
 
        if (pdata->flags & SH_MIPI_DSI_HFPBM) { /* HBPLEN */
-               top = ch->lcd_cfg[0].hsync_len + ch->lcd_cfg[0].left_margin;
+               top = ch->lcd_modes[0].hsync_len + ch->lcd_modes[0].left_margin;
                top = ((pdata->lane * top / div) - 10) << 16;
        }
        if (pdata->flags & SH_MIPI_DSI_HBPBM) { /* HFPLEN */
-               bottom = ch->lcd_cfg[0].right_margin;
+               bottom = ch->lcd_modes[0].right_margin;
                bottom = (pdata->lane * bottom / div) - 12;
        }
 
-       bpp = linelength / ch->lcd_cfg[0].xres; /* byte / pixel */
+       bpp = linelength / ch->lcd_modes[0].xres; /* byte / pixel */
        if ((pdata->lane / div) > bpp) {
-               tmp = ch->lcd_cfg[0].xres / bpp; /* output cycle */
-               tmp = ch->lcd_cfg[0].xres - tmp; /* (input - output) cycle */
+               tmp = ch->lcd_modes[0].xres / bpp; /* output cycle */
+               tmp = ch->lcd_modes[0].xres - tmp; /* (input - output) cycle */
                delay = (pdata->lane * tmp);
        }
 

diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index 422fcfd3cf28ac7870e53bb7865bb74893ab62b8..ab7b1797584651bc0dd8b515fac8a21f4e4e97a9 100644 (file)
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -1191,8 +1191,8 @@ static int sh_mobile_check_var(struct fb_var_screeninfo *var, struct fb_info *in
         * distance between two modes is defined as the size of the
         * non-overlapping parts of the two rectangles.
         */
-       for (i = 0; i < ch->cfg.num_cfg; ++i) {
-               const struct fb_videomode *mode = &ch->cfg.lcd_cfg[i];
+       for (i = 0; i < ch->cfg.num_modes; ++i) {
+               const struct fb_videomode *mode = &ch->cfg.lcd_modes[i];
                unsigned int dist;
 
                /* We can only round up. */
@@ -1211,7 +1211,7 @@ static int sh_mobile_check_var(struct fb_var_screeninfo *var, struct fb_info *in
        }
 
        /* If no available mode can be used, return an error. */
-       if (ch->cfg.num_cfg != 0) {
+       if (ch->cfg.num_modes != 0) {
                if (best_dist == (unsigned int)-1)
                        return -EINVAL;
 
@@ -1671,7 +1671,7 @@ sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_priv *priv,
        struct fb_var_screeninfo *var;
        struct fb_info *info;
        unsigned int max_size;
-       int num_cfg;
+       int num_modes;
        void *buf;
        int ret;
        int i;
@@ -1698,7 +1698,7 @@ sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_priv *priv,
        max_mode = NULL;
        max_size = 0;
 
-       for (i = 0, mode = cfg->lcd_cfg; i < cfg->num_cfg; i++, mode++) {
+       for (i = 0, mode = cfg->lcd_modes; i < cfg->num_modes; i++, mode++) {
                unsigned int size = mode->yres * mode->xres;
 
                /* NV12/NV21 buffers must have even number of lines */
@@ -1722,15 +1722,15 @@ sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_priv *priv,
                        max_mode->xres, max_mode->yres);
 
        /* Create the mode list. */
-       if (cfg->lcd_cfg == NULL) {
+       if (cfg->lcd_modes == NULL) {
                mode = &default_720p;
-               num_cfg = 1;
+               num_modes = 1;
        } else {
-               mode = cfg->lcd_cfg;
-               num_cfg = cfg->num_cfg;
+               mode = cfg->lcd_modes;
+               num_modes = cfg->num_modes;
        }
 
-       fb_videomode_to_modelist(mode, num_cfg, &info->modelist);
+       fb_videomode_to_modelist(mode, num_modes, &info->modelist);
 
        /* Initialize the transmitter device if present. */
        if (cfg->tx_dev) {

diff --git a/include/video/sh_mobile_lcdc.h b/include/video/sh_mobile_lcdc.h
index 4f0fb559ea878ec1abe6f992f3c791d67448d5d6..484b0a2d7b2f769148a72122ae56404dde177d4a 100644 (file)
--- a/include/video/sh_mobile_lcdc.h
+++ b/include/video/sh_mobile_lcdc.h
@@ -173,8 +173,8 @@ struct sh_mobile_lcdc_chan_cfg {
        int interface_type; /* selects RGBn or SYSn I/F, see above */
        int clock_divider;
        unsigned long flags; /* LCDC_FLAGS_... */
-       const struct fb_videomode *lcd_cfg;
-       int num_cfg;
+       const struct fb_videomode *lcd_modes;
+       int num_modes;
        struct sh_mobile_lcdc_panel_cfg panel_cfg;
        struct sh_mobile_lcdc_bl_info bl_info;
        struct sh_mobile_lcdc_sys_bus_cfg sys_bus_cfg; /* only for SYSn I/F */