Revert "drm/bridge: chrontel-ch7033: Add byteswap order setting"
authorRobert Foss <robert.foss@linaro.org>
Mon, 19 Sep 2022 10:20:09 +0000 (12:20 +0200)
committerRobert Foss <robert.foss@linaro.org>
Mon, 19 Sep 2022 13:17:04 +0000 (15:17 +0200)
Revert this patch since it depends on devicetree functionality that
previously has been reverted in the below commit.

commit e798ba3374a1 ("Revert "dt-bindings: Add byteswap order to chrontel ch7033"")

This reverts commit ce9564cfc9aea65e68eb343c599317633bc2321a.

Signed-off-by: Robert Foss <robert.foss@linaro.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220919102009.150503-3-robert.foss@linaro.org
drivers/gpu/drm/bridge/chrontel-ch7033.c

index c5719908ce2db546a8507d499104ceea90671d46..ba060277c3fdfbf933f5cb090e37f92412c104e3 100644 (file)
@@ -68,7 +68,6 @@ enum {
        BYTE_SWAP_GBR   = 3,
        BYTE_SWAP_BRG   = 4,
        BYTE_SWAP_BGR   = 5,
-       BYTE_SWAP_MAX   = 6,
 };
 
 /* Page 0, Register 0x19 */
@@ -356,8 +355,6 @@ static void ch7033_bridge_mode_set(struct drm_bridge *bridge,
        int hsynclen = mode->hsync_end - mode->hsync_start;
        int vbporch = mode->vsync_start - mode->vdisplay;
        int vsynclen = mode->vsync_end - mode->vsync_start;
-       u8 byte_swap;
-       int ret;
 
        /*
         * Page 4
@@ -401,16 +398,8 @@ static void ch7033_bridge_mode_set(struct drm_bridge *bridge,
        regmap_write(priv->regmap, 0x15, vbporch);
        regmap_write(priv->regmap, 0x16, vsynclen);
 
-       /* Input color swap. Byte order is optional and will default to
-        * BYTE_SWAP_BGR to preserve backwards compatibility with existing
-        * driver.
-        */
-       ret = of_property_read_u8(priv->bridge.of_node, "chrontel,byteswap",
-                                 &byte_swap);
-       if (!ret && byte_swap < BYTE_SWAP_MAX)
-               regmap_update_bits(priv->regmap, 0x18, SWAP, byte_swap);
-       else
-               regmap_update_bits(priv->regmap, 0x18, SWAP, BYTE_SWAP_BGR);
+       /* Input color swap. */
+       regmap_update_bits(priv->regmap, 0x18, SWAP, BYTE_SWAP_BGR);
 
        /* Input clock and sync polarity. */
        regmap_update_bits(priv->regmap, 0x19, 0x1, mode->clock >> 16);