Merge tag 'drm-misc-next-2018-11-07' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-block.git] / drivers / gpu / drm / panel / panel-simple.c

diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
index a04ffb3b21742a834c44c4770e2760f8139053dd..5fbee837b0dbedbdd22cc4232e61279e1cb26e2c 100644 (file)
--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
@@ -782,16 +782,38 @@ static const struct panel_desc avic_tm070ddh03 = {
        },
 };
 
+static const struct drm_display_mode bananapi_s070wv20_ct16_mode = {
+       .clock = 30000,
+       .hdisplay = 800,
+       .hsync_start = 800 + 40,
+       .hsync_end = 800 + 40 + 48,
+       .htotal = 800 + 40 + 48 + 40,
+       .vdisplay = 480,
+       .vsync_start = 480 + 13,
+       .vsync_end = 480 + 13 + 3,
+       .vtotal = 480 + 13 + 3 + 29,
+};
+
+static const struct panel_desc bananapi_s070wv20_ct16 = {
+       .modes = &bananapi_s070wv20_ct16_mode,
+       .num_modes = 1,
+       .bpc = 6,
+       .size = {
+               .width = 154,
+               .height = 86,
+       },
+};
+
 static const struct drm_display_mode boe_hv070wsa_mode = {
-       .clock = 40800,
+       .clock = 42105,
        .hdisplay = 1024,
-       .hsync_start = 1024 + 90,
-       .hsync_end = 1024 + 90 + 90,
-       .htotal = 1024 + 90 + 90 + 90,
+       .hsync_start = 1024 + 30,
+       .hsync_end = 1024 + 30 + 30,
+       .htotal = 1024 + 30 + 30 + 30,
        .vdisplay = 600,
-       .vsync_start = 600 + 3,
-       .vsync_end = 600 + 3 + 4,
-       .vtotal = 600 + 3 + 4 + 3,
+       .vsync_start = 600 + 10,
+       .vsync_end = 600 + 10 + 10,
+       .vtotal = 600 + 10 + 10 + 10,
        .vrefresh = 60,
 };
 
@@ -846,6 +868,55 @@ static const struct panel_desc boe_nv101wxmn51 = {
        },
 };
 
+static const struct drm_display_mode cdtech_s043wq26h_ct7_mode = {
+       .clock = 9000,
+       .hdisplay = 480,
+       .hsync_start = 480 + 5,
+       .hsync_end = 480 + 5 + 5,
+       .htotal = 480 + 5 + 5 + 40,
+       .vdisplay = 272,
+       .vsync_start = 272 + 8,
+       .vsync_end = 272 + 8 + 8,
+       .vtotal = 272 + 8 + 8 + 8,
+       .vrefresh = 60,
+       .flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC,
+};
+
+static const struct panel_desc cdtech_s043wq26h_ct7 = {
+       .modes = &cdtech_s043wq26h_ct7_mode,
+       .num_modes = 1,
+       .bpc = 8,
+       .size = {
+               .width = 95,
+               .height = 54,
+       },
+       .bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE,
+};
+
+static const struct drm_display_mode cdtech_s070wv95_ct16_mode = {
+       .clock = 35000,
+       .hdisplay = 800,
+       .hsync_start = 800 + 40,
+       .hsync_end = 800 + 40 + 40,
+       .htotal = 800 + 40 + 40 + 48,
+       .vdisplay = 480,
+       .vsync_start = 480 + 29,
+       .vsync_end = 480 + 29 + 13,
+       .vtotal = 480 + 29 + 13 + 3,
+       .vrefresh = 60,
+       .flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC,
+};
+
+static const struct panel_desc cdtech_s070wv95_ct16 = {
+       .modes = &cdtech_s070wv95_ct16_mode,
+       .num_modes = 1,
+       .bpc = 8,
+       .size = {
+               .width = 154,
+               .height = 85,
+       },
+};
+
 static const struct drm_display_mode chunghwa_claa070wp03xg_mode = {
        .clock = 66770,
        .hdisplay = 800,
@@ -971,6 +1042,36 @@ static const struct panel_desc dlc_dlc0700yzg_1 = {
        .bus_format = MEDIA_BUS_FMT_RGB666_1X7X3_SPWG,
 };
 
+static const struct display_timing dlc_dlc1010gig_timing = {
+       .pixelclock = { 68900000, 71100000, 73400000 },
+       .hactive = { 1280, 1280, 1280 },
+       .hfront_porch = { 43, 53, 63 },
+       .hback_porch = { 43, 53, 63 },
+       .hsync_len = { 44, 54, 64 },
+       .vactive = { 800, 800, 800 },
+       .vfront_porch = { 5, 8, 11 },
+       .vback_porch = { 5, 8, 11 },
+       .vsync_len = { 5, 7, 11 },
+       .flags = DISPLAY_FLAGS_DE_HIGH,
+};
+
+static const struct panel_desc dlc_dlc1010gig = {
+       .timings = &dlc_dlc1010gig_timing,
+       .num_timings = 1,
+       .bpc = 8,
+       .size = {
+               .width = 216,
+               .height = 135,
+       },
+       .delay = {
+               .prepare = 60,
+               .enable = 150,
+               .disable = 100,
+               .unprepare = 60,
+       },
+       .bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
+};
+
 static const struct drm_display_mode edt_et057090dhu_mode = {
        .clock = 25175,
        .hdisplay = 640,
@@ -2334,6 +2435,33 @@ static const struct panel_desc winstar_wf35ltiacd = {
        .bus_format = MEDIA_BUS_FMT_RGB888_1X24,
 };
 
+static const struct drm_display_mode arm_rtsm_mode[] = {
+       {
+               .clock = 65000,
+               .hdisplay = 1024,
+               .hsync_start = 1024 + 24,
+               .hsync_end = 1024 + 24 + 136,
+               .htotal = 1024 + 24 + 136 + 160,
+               .vdisplay = 768,
+               .vsync_start = 768 + 3,
+               .vsync_end = 768 + 3 + 6,
+               .vtotal = 768 + 3 + 6 + 29,
+               .vrefresh = 60,
+               .flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC,
+       },
+};
+
+static const struct panel_desc arm_rtsm = {
+       .modes = arm_rtsm_mode,
+       .num_modes = 1,
+       .bpc = 8,
+       .size = {
+               .width = 400,
+               .height = 300,
+       },
+       .bus_format = MEDIA_BUS_FMT_RGB888_1X24,
+};
+
 static const struct of_device_id platform_of_match[] = {
        {
                .compatible = "ampire,am-480272h3tmqw-t01h",
@@ -2341,6 +2469,9 @@ static const struct of_device_id platform_of_match[] = {
        }, {
                .compatible = "ampire,am800480r3tmqwa1h",
                .data = &ampire_am800480r3tmqwa1h,
+       }, {
+               .compatible = "arm,rtsm-display",
+               .data = &arm_rtsm,
        }, {
                .compatible = "auo,b101aw03",
                .data = &auo_b101aw03,
@@ -2380,12 +2511,21 @@ static const struct of_device_id platform_of_match[] = {
        }, {
                .compatible = "avic,tm070ddh03",
                .data = &avic_tm070ddh03,
+       }, {
+               .compatible = "bananapi,s070wv20-ct16",
+               .data = &bananapi_s070wv20_ct16,
        }, {
                .compatible = "boe,hv070wsa-100",
                .data = &boe_hv070wsa
        }, {
                .compatible = "boe,nv101wxmn51",
                .data = &boe_nv101wxmn51,
+       }, {
+               .compatible = "cdtech,s043wq26h-ct7",
+               .data = &cdtech_s043wq26h_ct7,
+       }, {
+               .compatible = "cdtech,s070wv95-ct16",
+               .data = &cdtech_s070wv95_ct16,
        }, {
                .compatible = "chunghwa,claa070wp03xg",
                .data = &chunghwa_claa070wp03xg,
@@ -2401,6 +2541,9 @@ static const struct of_device_id platform_of_match[] = {
        }, {
                .compatible = "dlc,dlc0700yzg-1",
                .data = &dlc_dlc0700yzg_1,
+       }, {
+               .compatible = "dlc,dlc1010gig",
+               .data = &dlc_dlc1010gig,
        }, {
                .compatible = "edt,et057090dhu",
                .data = &edt_et057090dhu,