#include <drm/drm_edid.h>
 #include <drm/drm_mipi_dsi.h>
 #include <drm/drm_panel.h>
+#include <drm/drm_of.h>
 
 /**
  * struct panel_desc - Describes a simple panel.
                dev_err(dev, "Reject override mode: No display_timing found\n");
 }
 
+static int panel_simple_override_nondefault_lvds_datamapping(struct device *dev,
+                                                            struct panel_simple *panel)
+{
+       int ret, bpc;
+
+       ret = drm_of_lvds_get_data_mapping(dev->of_node);
+       if (ret < 0) {
+               if (ret == -EINVAL)
+                       dev_warn(dev, "Ignore invalid data-mapping property\n");
+
+               /*
+                * Ignore non-existing or malformatted property, fallback to
+                * default data-mapping, and return 0.
+                */
+               return 0;
+       }
+
+       switch (ret) {
+       default:
+               WARN_ON(1);
+               fallthrough;
+       case MEDIA_BUS_FMT_RGB888_1X7X4_SPWG:
+               fallthrough;
+       case MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA:
+               bpc = 8;
+               break;
+       case MEDIA_BUS_FMT_RGB666_1X7X3_SPWG:
+               bpc = 6;
+       }
+
+       if (panel->desc->bpc != bpc || panel->desc->bus_format != ret) {
+               struct panel_desc *override_desc;
+
+               override_desc = devm_kmemdup(dev, panel->desc, sizeof(*panel->desc), GFP_KERNEL);
+               if (!override_desc)
+                       return -ENOMEM;
+
+               override_desc->bus_format = ret;
+               override_desc->bpc = bpc;
+               panel->desc = override_desc;
+       }
+
+       return 0;
+}
+
 static int panel_simple_probe(struct device *dev, const struct panel_desc *desc)
 {
        struct panel_simple *panel;
                        panel_simple_parse_panel_timing_node(dev, panel, &dt);
        }
 
+       if (desc->connector_type == DRM_MODE_CONNECTOR_LVDS) {
+               /* Optional data-mapping property for overriding bus format */
+               err = panel_simple_override_nondefault_lvds_datamapping(dev, panel);
+               if (err)
+                       goto free_ddc;
+       }
+
        connector_type = desc->connector_type;
        /* Catch common mistakes for panels. */
        switch (connector_type) {