videomode: combine videomode dmt_flags and data_flags
Both videomode and display_timing contain flags describing the modes. These are stored in dmt_flags and data_flags. There's no need to separate these flags, and having separate fields just makes the flags more difficult to use. This patch combines the fields and renames VESA_DMT_* flags to DISPLAY_FLAGS_*. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
This commit is contained in:
@@ -79,25 +79,24 @@ static struct display_timing *of_get_display_timing(struct device_node *np)
|
||||
ret |= parse_timing_property(np, "vsync-len", &dt->vsync_len);
|
||||
ret |= parse_timing_property(np, "clock-frequency", &dt->pixelclock);
|
||||
|
||||
dt->dmt_flags = 0;
|
||||
dt->data_flags = 0;
|
||||
dt->flags = 0;
|
||||
if (!of_property_read_u32(np, "vsync-active", &val))
|
||||
dt->dmt_flags |= val ? VESA_DMT_VSYNC_HIGH :
|
||||
VESA_DMT_VSYNC_LOW;
|
||||
dt->flags |= val ? DISPLAY_FLAGS_VSYNC_HIGH :
|
||||
DISPLAY_FLAGS_VSYNC_LOW;
|
||||
if (!of_property_read_u32(np, "hsync-active", &val))
|
||||
dt->dmt_flags |= val ? VESA_DMT_HSYNC_HIGH :
|
||||
VESA_DMT_HSYNC_LOW;
|
||||
dt->flags |= val ? DISPLAY_FLAGS_HSYNC_HIGH :
|
||||
DISPLAY_FLAGS_HSYNC_LOW;
|
||||
if (!of_property_read_u32(np, "de-active", &val))
|
||||
dt->data_flags |= val ? DISPLAY_FLAGS_DE_HIGH :
|
||||
dt->flags |= val ? DISPLAY_FLAGS_DE_HIGH :
|
||||
DISPLAY_FLAGS_DE_LOW;
|
||||
if (!of_property_read_u32(np, "pixelclk-active", &val))
|
||||
dt->data_flags |= val ? DISPLAY_FLAGS_PIXDATA_POSEDGE :
|
||||
dt->flags |= val ? DISPLAY_FLAGS_PIXDATA_POSEDGE :
|
||||
DISPLAY_FLAGS_PIXDATA_NEGEDGE;
|
||||
|
||||
if (of_property_read_bool(np, "interlaced"))
|
||||
dt->data_flags |= DISPLAY_FLAGS_INTERLACED;
|
||||
dt->flags |= DISPLAY_FLAGS_INTERLACED;
|
||||
if (of_property_read_bool(np, "doublescan"))
|
||||
dt->data_flags |= DISPLAY_FLAGS_DOUBLESCAN;
|
||||
dt->flags |= DISPLAY_FLAGS_DOUBLESCAN;
|
||||
|
||||
if (ret) {
|
||||
pr_err("%s: error reading timing properties\n",
|
||||
|
Reference in New Issue
Block a user