drm: Use new DRM_BUS_FLAG_*_(DRIVE|SAMPLE)_(POS|NEG)EDGE flags

The DRM_BUS_FLAG_PIXDATA_(POS|NEG)EDGE and
DRM_BUS_FLAG_SYNC_(POS|NEG)EDGE flags are deprecated in favour of the
new DRM_BUS_FLAG_PIXDATA_(DRIVE|SAMPLE)_(POS|NEG)EDGE and
new DRM_BUS_FLAG_SYNC_(DRIVE|SAMPLE)_(POS|NEG)EDGE flags. Replace them
through the code.

This effectively changes the value of the .sampling_edge bridge timings
field in the dumb-vga-dac driver. This is safe to do as no driver
consumes these values yet.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Stefan Agner <stefan@agner.ch>
Tested-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c
index 0805801f4e94c9becb7e360090602a07094e7728..94ed450e308dc49443a4d2a96932d1130b1fdbe5 100644 (file)
--- a/drivers/gpu/drm/bridge/dumb-vga-dac.c
+++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c
@@ -234,7 +234,7 @@ static int dumb_vga_remove(struct platform_device *pdev)
  */
 static const struct drm_bridge_timings default_dac_timings = {
        /* Timing specifications, datasheet page 7 */
-       .sampling_edge = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+       .sampling_edge = DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,
        .setup_time_ps = 500,
        .hold_time_ps = 1500,
 };
@@ -245,7 +245,7 @@ static const struct drm_bridge_timings default_dac_timings = {
  */
 static const struct drm_bridge_timings ti_ths8134_dac_timings = {
        /* From timing diagram, datasheet page 9 */
-       .sampling_edge = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+       .sampling_edge = DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,
        /* From datasheet, page 12 */
        .setup_time_ps = 3000,
        /* I guess this means latched input */
@@ -258,7 +258,7 @@ static const struct drm_bridge_timings ti_ths8134_dac_timings = {
  */
 static const struct drm_bridge_timings ti_ths8135_dac_timings = {
        /* From timing diagram, datasheet page 14 */
-       .sampling_edge = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+       .sampling_edge = DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,
        /* From datasheet, page 16 */
        .setup_time_ps = 2000,
        .hold_time_ps = 500,

diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
index 888980d4bc7413efc8710d2a868313c0d480d873..e570c9dee180f455686aee6ff305df9dd684eca4 100644 (file)
--- a/drivers/gpu/drm/bridge/tc358767.c
+++ b/drivers/gpu/drm/bridge/tc358767.c
@@ -1222,8 +1222,8 @@ static int tc_bridge_attach(struct drm_bridge *bridge)
                                         &bus_format, 1);
        tc->connector.display_info.bus_flags =
                DRM_BUS_FLAG_DE_HIGH |
-               DRM_BUS_FLAG_PIXDATA_NEGEDGE |
-               DRM_BUS_FLAG_SYNC_NEGEDGE;
+               DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE |
+               DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE;
        drm_connector_attach_encoder(&tc->connector, tc->bridge.encoder);
 
        return 0;

diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index 869ac6f4671efd621f4383824b6b947c71f33f29..56f92a0bba62aed78e394263573cccd21030719f 100644 (file)
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -655,22 +655,22 @@ EXPORT_SYMBOL_GPL(drm_display_mode_to_videomode);
  * @bus_flags: information about pixelclk, sync and DE polarity will be stored
  * here
  *
- * Sets DRM_BUS_FLAG_DE_(LOW|HIGH),  DRM_BUS_FLAG_PIXDATA_(POS|NEG)EDGE and
- * DISPLAY_FLAGS_SYNC_(POS|NEG)EDGE in @bus_flags according to DISPLAY_FLAGS
+ * Sets DRM_BUS_FLAG_DE_(LOW|HIGH),  DRM_BUS_FLAG_PIXDATA_DRIVE_(POS|NEG)EDGE
+ * and DISPLAY_FLAGS_SYNC_(POS|NEG)EDGE in @bus_flags according to DISPLAY_FLAGS
  * found in @vm
  */
 void drm_bus_flags_from_videomode(const struct videomode *vm, u32 *bus_flags)
 {
        *bus_flags = 0;
        if (vm->flags & DISPLAY_FLAGS_PIXDATA_POSEDGE)
-               *bus_flags |= DRM_BUS_FLAG_PIXDATA_POSEDGE;
+               *bus_flags |= DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE;
        if (vm->flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE)
-               *bus_flags |= DRM_BUS_FLAG_PIXDATA_NEGEDGE;
+               *bus_flags |= DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE;
 
        if (vm->flags & DISPLAY_FLAGS_SYNC_POSEDGE)
-               *bus_flags |= DRM_BUS_FLAG_SYNC_POSEDGE;
+               *bus_flags |= DRM_BUS_FLAG_SYNC_DRIVE_POSEDGE;
        if (vm->flags & DISPLAY_FLAGS_SYNC_NEGEDGE)
-               *bus_flags |= DRM_BUS_FLAG_SYNC_NEGEDGE;
+               *bus_flags |= DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE;
 
        if (vm->flags & DISPLAY_FLAGS_DE_LOW)
                *bus_flags |= DRM_BUS_FLAG_DE_LOW;

diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
index bf256971063d15b7d7ed5f65fc4bbdbfc50115f6..83c841b5027287ab1b8350ade9f833f13c3985b3 100644 (file)
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
@@ -94,7 +94,7 @@ static void fsl_dcu_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
        drm_display_mode_to_videomode(mode, &vm);
 
        /* INV_PXCK as default (most display sample data on rising edge) */
-       if (!(con->display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_POSEDGE))
+       if (!(con->display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE))
                pol |= DCU_SYN_POL_INV_PXCK;
 
        if (vm.flags & DISPLAY_FLAGS_HSYNC_LOW)

diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c
index ec3602ebbc1cd1e87da13c9c909078927ccf2287..311a20c942ebbc5338d95c39ca08002a973e95fc 100644 (file)
--- a/drivers/gpu/drm/imx/ipuv3-crtc.c
+++ b/drivers/gpu/drm/imx/ipuv3-crtc.c
@@ -295,7 +295,7 @@ static void ipu_crtc_mode_set_nofb(struct drm_crtc *crtc)
        sig_cfg.enable_pol = !(imx_crtc_state->bus_flags & DRM_BUS_FLAG_DE_LOW);
        /* Default to driving pixel data on negative clock edges */
        sig_cfg.clk_pol = !!(imx_crtc_state->bus_flags &
-                            DRM_BUS_FLAG_PIXDATA_POSEDGE);
+                            DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE);
        sig_cfg.bus_format = imx_crtc_state->bus_format;
        sig_cfg.v_to_h_sync = 0;
        sig_cfg.hsync_pin = imx_crtc_state->di_hsync_pin;

diff --git a/drivers/gpu/drm/mxsfb/mxsfb_crtc.c b/drivers/gpu/drm/mxsfb/mxsfb_crtc.c
index 0ee1ca8a316a4cd5c4b30f4ae026b8a9095796b7..98e9bda91e801789362a5f38f43577633d546fad 100644 (file)
--- a/drivers/gpu/drm/mxsfb/mxsfb_crtc.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_crtc.c
@@ -253,12 +253,12 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb)
        if (!(bus_flags & DRM_BUS_FLAG_DE_LOW))
                vdctrl0 |= VDCTRL0_ENABLE_ACT_HIGH;
        /*
-        * DRM_BUS_FLAG_PIXDATA_ defines are controller centric,
+        * DRM_BUS_FLAG_PIXDATA_DRIVE_ defines are controller centric,
         * controllers VDCTRL0_DOTCLK is display centric.
         * Drive on positive edge       -> display samples on falling edge
-        * DRM_BUS_FLAG_PIXDATA_POSEDGE -> VDCTRL0_DOTCLK_ACT_FALLING
+        * DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE -> VDCTRL0_DOTCLK_ACT_FALLING
         */
-       if (bus_flags & DRM_BUS_FLAG_PIXDATA_POSEDGE)
+       if (bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE)
                vdctrl0 |= VDCTRL0_DOTCLK_ACT_FALLING;
 
        writel(vdctrl0, mxsfb->base + LCDC_VDCTRL0);

diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
index fb88537de1ccd8918105a6ddc0e98b6d5f8f7b19..de954182c4bbc57d24978d90eaddf2b649ebb07d 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
@@ -86,8 +86,9 @@ static int tfp410_probe(struct platform_device *pdev)
        dssdev->type = OMAP_DISPLAY_TYPE_DPI;
        dssdev->owner = THIS_MODULE;
        dssdev->of_ports = BIT(1) | BIT(0);
-       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_SYNC_POSEDGE
-                         | DRM_BUS_FLAG_PIXDATA_POSEDGE;
+       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH
+                         | DRM_BUS_FLAG_SYNC_DRIVE_POSEDGE
+                         | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE;
 
        dssdev->next = omapdss_of_find_connected_device(pdev->dev.of_node, 1);
        if (IS_ERR(dssdev->next)) {

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
index 4133351924bea1067c2928aa0398bc7576d0bab1..99f2350d462cd7c661b7e2ec428ad21bd91fed25 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
@@ -207,8 +207,9 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
         * DE is active LOW
         * DATA needs to be driven on the FALLING edge
         */
-       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_SYNC_NEGEDGE
-                         | DRM_BUS_FLAG_PIXDATA_POSEDGE;
+       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH
+                         | DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE
+                         | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE;
 
        omapdss_display_init(dssdev);
        omapdss_device_register(dssdev);

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
index 498a88307f0489ac405c77e0f3e65e02cd5dcac7..c2409815a2046b159f3a7dbfeb1c0433b24f85e9 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
@@ -196,8 +196,9 @@ static int nec_8048_probe(struct spi_device *spi)
        dssdev->owner = THIS_MODULE;
        dssdev->of_ports = BIT(0);
        dssdev->ops_flags = OMAP_DSS_DEVICE_OP_MODES;
-       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_SYNC_POSEDGE
-                         | DRM_BUS_FLAG_PIXDATA_POSEDGE;
+       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH
+                         | DRM_BUS_FLAG_SYNC_DRIVE_POSEDGE
+                         | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE;
 
        omapdss_display_init(dssdev);
        omapdss_device_register(dssdev);

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
index 1e68e0d14f87a906e7811b92230238dc5461bc2a..9c545de430f65ccd63b6d22f2cf0994f82b181e3 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
@@ -216,8 +216,9 @@ static int sharp_ls_probe(struct platform_device *pdev)
         * Note: According to the panel documentation:
         * DATA needs to be driven on the FALLING edge
         */
-       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_SYNC_NEGEDGE
-                         | DRM_BUS_FLAG_PIXDATA_POSEDGE;
+       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH
+                         | DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE
+                         | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE;
 
        omapdss_display_init(dssdev);
        omapdss_device_register(dssdev);

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
index abee0b348cffff2a235cecf2ed80b1944857cc09..2038def14ba117ae7a2fe244752b9d3e0b65abe3 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
@@ -710,8 +710,9 @@ static int acx565akm_probe(struct spi_device *spi)
        dssdev->owner = THIS_MODULE;
        dssdev->of_ports = BIT(0);
        dssdev->ops_flags = OMAP_DSS_DEVICE_OP_MODES;
-       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_SYNC_NEGEDGE
-                         | DRM_BUS_FLAG_PIXDATA_POSEDGE;
+       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH
+                         | DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE
+                         | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE;
 
        omapdss_display_init(dssdev);
        omapdss_device_register(dssdev);

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
index 5b4fbcc196bc72abbc3a71c4611765fbd53a7e24..fa80d4f7f699ed2dc6f84b7a60173d8ba7007c36 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
@@ -330,8 +330,9 @@ static int td028ttec1_panel_probe(struct spi_device *spi)
         * Note: According to the panel documentation:
         * SYNC needs to be driven on the FALLING edge
         */
-       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_SYNC_POSEDGE
-                         | DRM_BUS_FLAG_PIXDATA_NEGEDGE;
+       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH
+                         | DRM_BUS_FLAG_SYNC_DRIVE_POSEDGE
+                         | DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE;
 
        omapdss_display_init(dssdev);
        omapdss_device_register(dssdev);

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
index 781dc8b0afe7c5b61d924ca7223741deebfe7ad5..0b692fc7e5ea7709862556761776786e6b18c1f2 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
@@ -429,8 +429,9 @@ static int tpo_td043_probe(struct spi_device *spi)
         * Note: According to the panel documentation:
         * SYNC needs to be driven on the FALLING edge
         */
-       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_SYNC_POSEDGE
-                         | DRM_BUS_FLAG_PIXDATA_NEGEDGE;
+       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH
+                         | DRM_BUS_FLAG_SYNC_DRIVE_POSEDGE
+                         | DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE;
 
        omapdss_display_init(dssdev);
        omapdss_device_register(dssdev);

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 2582b566e0b02fc16737def9004b8e02e573eec3..5c34fba5197565e0ba6d253fed214aabf100beea 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -5127,9 +5127,9 @@ static int dsi_init_output(struct dsi_data *dsi)
        out->ops = &dsi_ops;
        out->owner = THIS_MODULE;
        out->of_ports = BIT(0);
-       out->bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE
+       out->bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE
                       | DRM_BUS_FLAG_DE_HIGH
-                      | DRM_BUS_FLAG_SYNC_NEGEDGE;
+                      | DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE;
 
        r = omapdss_device_init_output(out);
        if (r < 0)

diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index e7945322c47122985fc040f22f4db79af4269869..7aae52984fed7941cfa584c3afd8c732590e3a82 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -279,8 +279,8 @@ static int sdi_init_output(struct sdi_device *sdi)
        out->of_ports = BIT(1);
        out->ops = &sdi_ops;
        out->owner = THIS_MODULE;
-       out->bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE   /* 15.5.9.1.2 */
-                      | DRM_BUS_FLAG_SYNC_POSEDGE;
+       out->bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE     /* 15.5.9.1.2 */
+                      | DRM_BUS_FLAG_SYNC_DRIVE_POSEDGE;
 
        r = omapdss_device_init_output(out);
        if (r < 0)

diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c
index 42748479d3745803628708762509e624e1d2fc96..b83a2ae64a03c02202973e236a74571e15192ef4 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@ -114,17 +114,17 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder,
 
                if (!(vm.flags & (DISPLAY_FLAGS_PIXDATA_POSEDGE |
                                  DISPLAY_FLAGS_PIXDATA_NEGEDGE))) {
-                       if (bus_flags & DRM_BUS_FLAG_PIXDATA_POSEDGE)
+                       if (bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE)
                                vm.flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE;
-                       else if (bus_flags & DRM_BUS_FLAG_PIXDATA_NEGEDGE)
+                       else if (bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE)
                                vm.flags |= DISPLAY_FLAGS_PIXDATA_NEGEDGE;
                }
 
                if (!(vm.flags & (DISPLAY_FLAGS_SYNC_POSEDGE |
                                  DISPLAY_FLAGS_SYNC_NEGEDGE))) {
-                       if (bus_flags & DRM_BUS_FLAG_SYNC_POSEDGE)
+                       if (bus_flags & DRM_BUS_FLAG_SYNC_DRIVE_POSEDGE)
                                vm.flags |= DISPLAY_FLAGS_SYNC_POSEDGE;
-                       else if (bus_flags & DRM_BUS_FLAG_SYNC_NEGEDGE)
+                       else if (bus_flags & DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE)
                                vm.flags |= DISPLAY_FLAGS_SYNC_NEGEDGE;
                }
        }

diff --git a/drivers/gpu/drm/panel/panel-arm-versatile.c b/drivers/gpu/drm/panel/panel-arm-versatile.c
index b428c467810674f1e0367d6699f97298465344c7..078fa2c0eef86e698d06086411063dde2d46b0ee 100644 (file)
--- a/drivers/gpu/drm/panel/panel-arm-versatile.c
+++ b/drivers/gpu/drm/panel/panel-arm-versatile.c
@@ -191,7 +191,7 @@ static const struct versatile_panel_type versatile_panels[] = {
                        .vrefresh = 390,
                        .flags = DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC,
                },
-               .bus_flags = DRM_BUS_FLAG_PIXDATA_NEGEDGE,
+               .bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE,
        },
        /*
         * Sanyo ALR252RGT 240x320 portrait display found on the
@@ -215,7 +215,7 @@ static const struct versatile_panel_type versatile_panels[] = {
                        .vrefresh = 116,
                        .flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC,
                },
-               .bus_flags = DRM_BUS_FLAG_PIXDATA_NEGEDGE,
+               .bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE,
                .ib2 = true,
        },
 };

diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9322.c b/drivers/gpu/drm/panel/panel-ilitek-ili9322.c
index bd38bf4f1ba6450c6dd63035cda7943e08377a6b..35497ff08391b7c38f70b5eddf21f522f85dd688 100644 (file)
--- a/drivers/gpu/drm/panel/panel-ilitek-ili9322.c
+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9322.c
@@ -412,11 +412,11 @@ static int ili9322_init(struct drm_panel *panel, struct ili9322 *ili)
        if (ili->conf->dclk_active_high) {
                reg = ILI9322_POL_DCLK;
                connector->display_info.bus_flags |=
-                       DRM_BUS_FLAG_PIXDATA_POSEDGE;
+                       DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE;
        } else {
                reg = 0;
                connector->display_info.bus_flags |=
-                       DRM_BUS_FLAG_PIXDATA_NEGEDGE;
+                       DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE;
        }
        if (ili->conf->de_active_high) {
                reg |= ILI9322_POL_DE;

diff --git a/drivers/gpu/drm/panel/panel-seiko-43wvf1g.c b/drivers/gpu/drm/panel/panel-seiko-43wvf1g.c
index 2d99e28ff117f078bd767dbb27e2c8baf13f0f0a..bdcc5d80823dc5ae72df9b06063f62656c34d67e 100644 (file)
--- a/drivers/gpu/drm/panel/panel-seiko-43wvf1g.c
+++ b/drivers/gpu/drm/panel/panel-seiko-43wvf1g.c
@@ -328,7 +328,7 @@ static const struct seiko_panel_desc seiko_43wvf1g = {
                .height = 57,
        },
        .bus_format = MEDIA_BUS_FMT_RGB888_1X24,
-       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_NEGEDGE,
+       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE,
 };
 
 static const struct of_device_id platform_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
index 9e8218f6a3f20aebe19a01f8140dbb78c17fc86f..64516f23a957bf480ab3c5e8b9e8ea553788d603 100644 (file)
--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
@@ -914,7 +914,7 @@ static const struct panel_desc cdtech_s043wq26h_ct7 = {
                .width = 95,
                .height = 54,
        },
-       .bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+       .bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
 };
 
 static const struct drm_display_mode cdtech_s070wv95_ct16_mode = {
@@ -1034,7 +1034,7 @@ static const struct panel_desc dataimage_scf0700c48ggu18 = {
                .height = 91,
        },
        .bus_format = MEDIA_BUS_FMT_RGB888_1X24,
-       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_POSEDGE,
+       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
 };
 
 static const struct display_timing dlc_dlc0700yzg_1_timing = {
@@ -1119,7 +1119,7 @@ static const struct panel_desc edt_et057090dhu = {
                .height = 86,
        },
        .bus_format = MEDIA_BUS_FMT_RGB666_1X18,
-       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_NEGEDGE,
+       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE,
 };
 
 static const struct drm_display_mode edt_etm0700g0dh6_mode = {
@@ -1145,7 +1145,7 @@ static const struct panel_desc edt_etm0700g0dh6 = {
                .height = 91,
        },
        .bus_format = MEDIA_BUS_FMT_RGB666_1X18,
-       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_NEGEDGE,
+       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE,
 };
 
 static const struct panel_desc edt_etm0700g0bdh6 = {
@@ -1157,7 +1157,7 @@ static const struct panel_desc edt_etm0700g0bdh6 = {
                .height = 91,
        },
        .bus_format = MEDIA_BUS_FMT_RGB666_1X18,
-       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_POSEDGE,
+       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
 };
 
 static const struct drm_display_mode foxlink_fl500wvr00_a0t_mode = {
@@ -1311,7 +1311,7 @@ static const struct panel_desc innolux_at043tn24 = {
                .height = 54,
        },
        .bus_format = MEDIA_BUS_FMT_RGB888_1X24,
-       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_POSEDGE,
+       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
 };
 
 static const struct drm_display_mode innolux_at070tn92_mode = {
@@ -1818,7 +1818,7 @@ static const struct panel_desc nec_nl4827hc19_05b = {
                .height = 54,
        },
        .bus_format = MEDIA_BUS_FMT_RGB888_1X24,
-       .bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+       .bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
 };
 
 static const struct drm_display_mode netron_dy_e231732_mode = {
@@ -1867,8 +1867,8 @@ static const struct panel_desc newhaven_nhd_43_480272ef_atxl = {
                .height = 54,
        },
        .bus_format = MEDIA_BUS_FMT_RGB888_1X24,
-       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_POSEDGE |
-                    DRM_BUS_FLAG_SYNC_POSEDGE,
+       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE |
+                    DRM_BUS_FLAG_SYNC_DRIVE_POSEDGE,
 };
 
 static const struct display_timing nlt_nl192108ac18_02d_timing = {
@@ -2029,7 +2029,7 @@ static const struct panel_desc ortustech_com43h4m85ulc = {
                .height = 93,
        },
        .bus_format = MEDIA_BUS_FMT_RGB888_1X24,
-       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_POSEDGE,
+       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
 };
 
 static const struct drm_display_mode pda_91_00156_a0_mode = {
@@ -2398,7 +2398,7 @@ static const struct panel_desc toshiba_lt089ac29000 = {
                .height = 116,
        },
        .bus_format = MEDIA_BUS_FMT_RGB888_1X24,
-       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_POSEDGE,
+       .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
 };
 
 static const struct drm_display_mode tpk_f07a_0102_mode = {
@@ -2421,7 +2421,7 @@ static const struct panel_desc tpk_f07a_0102 = {
                .width = 152,
                .height = 91,
        },
-       .bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+       .bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
 };
 
 static const struct drm_display_mode tpk_f10a_0102_mode = {

diff --git a/drivers/gpu/drm/panel/panel-tpo-tpg110.c b/drivers/gpu/drm/panel/panel-tpo-tpg110.c
index 5a9f8f4d5d24d29cef85001d0f3f608b5d3e0753..25f00cfc1af4e1e0ddaf5c98e8781060fff718fd 100644 (file)
--- a/drivers/gpu/drm/panel/panel-tpo-tpg110.c
+++ b/drivers/gpu/drm/panel/panel-tpo-tpg110.c
@@ -118,7 +118,7 @@ static const struct tpg110_panel_mode tpg110_modes[] = {
                        .vtotal = 480 + 10 + 1 + 35,
                        .vrefresh = 60,
                },
-               .bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+               .bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
        },
        {
                .name = "640x480 RGB",
@@ -135,7 +135,7 @@ static const struct tpg110_panel_mode tpg110_modes[] = {
                        .vtotal = 480 + 18 + 1 + 27,
                        .vrefresh = 60,
                },
-               .bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+               .bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
        },
        {
                .name = "480x272 RGB",
@@ -152,7 +152,7 @@ static const struct tpg110_panel_mode tpg110_modes[] = {
                        .vtotal = 272 + 2 + 1 + 12,
                        .vrefresh = 60,
                },
-               .bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+               .bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
        },
        {
                .name = "480x640 RGB",
@@ -169,7 +169,7 @@ static const struct tpg110_panel_mode tpg110_modes[] = {
                        .vtotal = 640 + 4 + 1 + 8,
                        .vrefresh = 60,
                },
-               .bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+               .bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
        },
        {
                .name = "400x240 RGB",
@@ -186,7 +186,7 @@ static const struct tpg110_panel_mode tpg110_modes[] = {
                        .vtotal = 240 + 2 + 1 + 20,
                        .vrefresh = 60,
                },
-               .bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+               .bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
        },
 };
 

diff --git a/drivers/gpu/drm/pl111/pl111_display.c b/drivers/gpu/drm/pl111/pl111_display.c
index 754f6b25f2652ee83e578c1a6786190eb554e70f..0c5d391f0a8f3a77b527301fcd91c7817f53bd5b 100644 (file)
--- a/drivers/gpu/drm/pl111/pl111_display.c
+++ b/drivers/gpu/drm/pl111/pl111_display.c
@@ -188,7 +188,7 @@ static void pl111_display_enable(struct drm_simple_display_pipe *pipe,
                        tim2 |= TIM2_IOE;
 
                if (connector->display_info.bus_flags &
-                   DRM_BUS_FLAG_PIXDATA_NEGEDGE)
+                   DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE)
                        tim2 |= TIM2_IPC;
        }
 

diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
index 7136fc91c6036cdb69d40a7d267ff5143c649d5c..ca713d2002804fcc9d7a775f9fa97d26e0c4d26c 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
@@ -561,10 +561,10 @@ static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon,
         * Following code is a way to avoid quirks all around TCON
         * and DOTCLOCK drivers.
         */
-       if (display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_POSEDGE)
+       if (display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE)
                clk_set_phase(tcon->dclk, 240);
 
-       if (display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_NEGEDGE)
+       if (display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE)
                clk_set_phase(tcon->dclk, 0);
 
        regmap_update_bits(tcon->regs, SUN4I_TCON0_IO_POL_REG,

diff --git a/drivers/gpu/drm/tve200/tve200_display.c b/drivers/gpu/drm/tve200/tve200_display.c
index e8723a2412a6f5d7a0522799b1bb60cca1458e60..d775d10dbe6a16e2342c52ce31c5db0286b8f54d 100644 (file)
--- a/drivers/gpu/drm/tve200/tve200_display.c
+++ b/drivers/gpu/drm/tve200/tve200_display.c
@@ -149,7 +149,8 @@ static void tve200_display_enable(struct drm_simple_display_pipe *pipe,
        /* Vsync IRQ at start of Vsync at first */
        ctrl1 |= TVE200_VSTSTYPE_VSYNC;
 
-       if (connector->display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_NEGEDGE)
+       if (connector->display_info.bus_flags &
+           DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE)
                ctrl1 |= TVE200_CTRL_TVCLKP;
 
        if ((mode->hdisplay == 352 && mode->vdisplay == 240) || /* SIF(525) */

diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h
index 9da8c93f79764ab5c246afa612a7eb748962153a..5e5129206f408c5d4a905fefd033a4097e12caa0 100644 (file)
--- a/include/drm/drm_bridge.h
+++ b/include/drm/drm_bridge.h
@@ -246,10 +246,11 @@ struct drm_bridge_timings {
        /**
         * @sampling_edge:
         *
-        * Tells whether the bridge samples the digital input signal
-        * from the display engine on the positive or negative edge of the
-        * clock, this should reuse the DRM_BUS_FLAG_PIXDATA_[POS|NEG]EDGE
-        * bitwise flags from the DRM connector (bit 2 and 3 valid).
+        * Tells whether the bridge samples the digital input signals from the
+        * display engine on the positive or negative edge of the clock. This
+        * should use the DRM_BUS_FLAG_PIXDATA_SAMPLE_[POS|NEG]EDGE and
+        * DRM_BUS_FLAG_SYNC_SAMPLE_[POS|NEG]EDGE bitwise flags from the DRM
+        * connector (bit 2, 3, 6 and 7 valid).
         */
        u32 sampling_edge;
        /**