Merge tag 'staging-4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[deliverable/linux.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 ada97a01a651bd64ebd3ada193f6cece2592460a..f88a631c43ab0eb4a79f0fb8fc27741eb1c79319 100644 (file)
--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
@@ -44,6 +44,10 @@ struct panel_desc {
 
        unsigned int bpc;
 
+       /**
+        * @width: width (in millimeters) of the panel's active display area
+        * @height: height (in millimeters) of the panel's active display area
+        */
        struct {
                unsigned int width;
                unsigned int height;
@@ -930,6 +934,30 @@ static const struct panel_desc innolux_zj070na_01p = {
        },
 };
 
+static const struct display_timing kyo_tcg121xglp_timing = {
+       .pixelclock = { 52000000, 65000000, 71000000 },
+       .hactive = { 1024, 1024, 1024 },
+       .hfront_porch = { 2, 2, 2 },
+       .hback_porch = { 2, 2, 2 },
+       .hsync_len = { 86, 124, 244 },
+       .vactive = { 768, 768, 768 },
+       .vfront_porch = { 2, 2, 2 },
+       .vback_porch = { 2, 2, 2 },
+       .vsync_len = { 6, 34, 73 },
+       .flags = DISPLAY_FLAGS_DE_HIGH,
+};
+
+static const struct panel_desc kyo_tcg121xglp = {
+       .timings = &kyo_tcg121xglp_timing,
+       .num_timings = 1,
+       .bpc = 8,
+       .size = {
+               .width = 246,
+               .height = 184,
+       },
+       .bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
+};
+
 static const struct drm_display_mode lg_lb070wv8_mode = {
        .clock = 33246,
        .hdisplay = 800,
@@ -1055,6 +1083,30 @@ static const struct panel_desc ortustech_com43h4m85ulc = {
        .bus_format = MEDIA_BUS_FMT_RGB888_1X24,
 };
 
+static const struct drm_display_mode qd43003c0_40_mode = {
+       .clock = 9000,
+       .hdisplay = 480,
+       .hsync_start = 480 + 8,
+       .hsync_end = 480 + 8 + 4,
+       .htotal = 480 + 8 + 4 + 39,
+       .vdisplay = 272,
+       .vsync_start = 272 + 4,
+       .vsync_end = 272 + 4 + 10,
+       .vtotal = 272 + 4 + 10 + 2,
+       .vrefresh = 60,
+};
+
+static const struct panel_desc qd43003c0_40 = {
+       .modes = &qd43003c0_40_mode,
+       .num_modes = 1,
+       .bpc = 8,
+       .size = {
+               .width = 95,
+               .height = 53,
+       },
+       .bus_format = MEDIA_BUS_FMT_RGB888_1X24,
+};
+
 static const struct drm_display_mode samsung_ltn101nt05_mode = {
        .clock = 54030,
        .hdisplay = 1024,
@@ -1197,6 +1249,9 @@ static const struct of_device_id platform_of_match[] = {
        }, {
                .compatible = "innolux,zj070na-01p",
                .data = &innolux_zj070na_01p,
+       }, {
+               .compatible = "kyo,tcg121xglp",
+               .data = &kyo_tcg121xglp,
        }, {
                .compatible = "lg,lb070wv8",
                .data = &lg_lb070wv8,
@@ -1212,6 +1267,9 @@ static const struct of_device_id platform_of_match[] = {
        }, {
                .compatible = "ortustech,com43h4m85ulc",
                .data = &ortustech_com43h4m85ulc,
+       }, {
+               .compatible = "qiaodian,qd43003c0-40",
+               .data = &qd43003c0_40,
        }, {
                .compatible = "samsung,ltn101nt05",
                .data = &samsung_ltn101nt05,