drm/msm/dsi: Add DSI configuration for SDM660

This also applies to sdm630/636 and their SDA
counterparts.

Signed-off-by: Konrad Dybcio <konradybcio@gmail.com>
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c
index 813d69deb5e8d4760510eaa701fe3e502d2b5b30..f892f2cbe8bb65ef0408a44ba31729bc4c37f4f7 100644 (file)
--- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c
@@ -149,6 +149,25 @@ static const struct msm_dsi_config msm8998_dsi_cfg = {
        .num_dsi = 2,
 };
 
+static const char * const dsi_sdm660_bus_clk_names[] = {
+       "iface", "bus", "core", "core_mmss",
+};
+
+static const struct msm_dsi_config sdm660_dsi_cfg = {
+       .io_offset = DSI_6G_REG_SHIFT,
+       .reg_cfg = {
+               .num = 2,
+               .regs = {
+                       {"vdd", 73400, 32 },    /* 0.9 V */
+                       {"vdda", 12560, 4 },    /* 1.2 V */
+               },
+       },
+       .bus_clk_names = dsi_sdm660_bus_clk_names,
+       .num_bus_clks = ARRAY_SIZE(dsi_sdm660_bus_clk_names),
+       .io_start = { 0xc994000, 0xc996000 },
+       .num_dsi = 2,
+};
+
 static const char * const dsi_sdm845_bus_clk_names[] = {
        "iface", "bus",
 };
@@ -240,6 +259,8 @@ static const struct msm_dsi_cfg_handler dsi_cfg_handlers[] = {
                &msm8996_dsi_cfg, &msm_dsi_6g_host_ops},
        {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_4_2,
                &msm8976_dsi_cfg, &msm_dsi_6g_host_ops},
+       {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_1_0,
+               &sdm660_dsi_cfg, &msm_dsi_6g_v2_host_ops},
        {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_2_0,
                &msm8998_dsi_cfg, &msm_dsi_6g_v2_host_ops},
        {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_2_1,

diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.h b/drivers/gpu/drm/msm/dsi/dsi_cfg.h
index 217e24a651781d5b95d944544566efcd77ee3597..efd469d1db45998a1defbc7241fa853d2be39434 100644 (file)
--- a/drivers/gpu/drm/msm/dsi/dsi_cfg.h
+++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.h
@@ -18,6 +18,7 @@
 #define MSM_DSI_6G_VER_MINOR_V1_3_1    0x10030001
 #define MSM_DSI_6G_VER_MINOR_V1_4_1    0x10040001
 #define MSM_DSI_6G_VER_MINOR_V1_4_2    0x10040002
+#define MSM_DSI_6G_VER_MINOR_V2_1_0    0x20010000
 #define MSM_DSI_6G_VER_MINOR_V2_2_0    0x20000000
 #define MSM_DSI_6G_VER_MINOR_V2_2_1    0x20020001
 #define MSM_DSI_6G_VER_MINOR_V2_4_1    0x20040001