Merge drm/drm-next into drm-misc-next

[linux-2.6-microblaze.git] / drivers / gpu / drm / panel / panel-edp.c

diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c
index 599a949..f226773 100644 (file)
--- a/drivers/gpu/drm/panel/panel-edp.c
+++ b/drivers/gpu/drm/panel/panel-edp.c
@@ -978,32 +978,6 @@ static const struct panel_desc auo_b116xak01 = {
        },
 };
 
-static const struct drm_display_mode auo_b116xw03_mode = {
-       .clock = 70589,
-       .hdisplay = 1366,
-       .hsync_start = 1366 + 40,
-       .hsync_end = 1366 + 40 + 40,
-       .htotal = 1366 + 40 + 40 + 32,
-       .vdisplay = 768,
-       .vsync_start = 768 + 10,
-       .vsync_end = 768 + 10 + 12,
-       .vtotal = 768 + 10 + 12 + 6,
-       .flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC,
-};
-
-static const struct panel_desc auo_b116xw03 = {
-       .modes = &auo_b116xw03_mode,
-       .num_modes = 1,
-       .bpc = 6,
-       .size = {
-               .width = 256,
-               .height = 144,
-       },
-       .delay = {
-               .enable = 400,
-       },
-};
-
 static const struct drm_display_mode auo_b133han05_mode = {
        .clock = 142600,
        .hdisplay = 1920,
@@ -1727,9 +1701,6 @@ static const struct of_device_id platform_of_match[] = {
        }, {
                .compatible = "auo,b116xa01",
                .data = &auo_b116xak01,
-       }, {
-               .compatible = "auo,b116xw03",
-               .data = &auo_b116xw03,
        }, {
                .compatible = "auo,b133han05",
                .data = &auo_b133han05,