aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm
diff options
context:
space:
mode:
authorArchit Taneja <architt@codeaurora.org>2015-10-12 01:46:48 -0400
committerRob Clark <robdclark@gmail.com>2015-12-14 10:40:40 -0500
commitcea65dbd6a96bd97818a7a95034a046409040afa (patch)
tree61181585fc4265def4eb72f183c2ef86b73ca77b /drivers/gpu/drm/msm
parent4bfa97489ae786c95d0f2999326a524443013cc1 (diff)
drm/msm/dsi: Add dsi_cfg for APQ8064
Add a dsi_cfg entry for APQ8064. Since this is the first DSIv2 chip to be supported, add a list of bus clocks that are required by the DSIv2 block. Signed-off-by: Archit Taneja <architt@codeaurora.org> Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm')
-rw-r--r--drivers/gpu/drm/msm/dsi/dsi_cfg.c19
-rw-r--r--drivers/gpu/drm/msm/dsi/dsi_cfg.h2
2 files changed, 18 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c
index c40044f8a6c0..2a827d8093a2 100644
--- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c
@@ -13,9 +13,22 @@
13 13
14#include "dsi_cfg.h" 14#include "dsi_cfg.h"
15 15
16/* DSI v2 has not been supported by now */ 16static const char * const dsi_v2_bus_clk_names[] = {
17static const struct msm_dsi_config dsi_v2_cfg = { 17 "core_mmss_clk", "iface_clk", "bus_clk",
18};
19
20static const struct msm_dsi_config apq8064_dsi_cfg = {
18 .io_offset = 0, 21 .io_offset = 0,
22 .reg_cfg = {
23 .num = 3,
24 .regs = {
25 {"vdda", 1200000, 1200000, 100000, 100},
26 {"avdd", 3000000, 3000000, 110000, 100},
27 {"vddio", 1800000, 1800000, 100000, 100},
28 },
29 },
30 .bus_clk_names = dsi_v2_bus_clk_names,
31 .num_bus_clks = ARRAY_SIZE(dsi_v2_bus_clk_names),
19}; 32};
20 33
21static const char * const dsi_6g_bus_clk_names[] = { 34static const char * const dsi_6g_bus_clk_names[] = {
@@ -75,7 +88,7 @@ static const struct msm_dsi_config msm8994_dsi_cfg = {
75}; 88};
76 89
77static const struct msm_dsi_cfg_handler dsi_cfg_handlers[] = { 90static const struct msm_dsi_cfg_handler dsi_cfg_handlers[] = {
78 {MSM_DSI_VER_MAJOR_V2, U32_MAX, &dsi_v2_cfg}, 91 {MSM_DSI_VER_MAJOR_V2, MSM_DSI_V2_VER_MINOR_8064, &apq8064_dsi_cfg},
79 {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_0, 92 {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_0,
80 &msm8974_apq8084_dsi_cfg}, 93 &msm8974_apq8084_dsi_cfg},
81 {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_1, 94 {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_1,
diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.h b/drivers/gpu/drm/msm/dsi/dsi_cfg.h
index 5a36836dd6fc..a68c836744a3 100644
--- a/drivers/gpu/drm/msm/dsi/dsi_cfg.h
+++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.h
@@ -25,6 +25,8 @@
25#define MSM_DSI_6G_VER_MINOR_V1_3 0x10030000 25#define MSM_DSI_6G_VER_MINOR_V1_3 0x10030000
26#define MSM_DSI_6G_VER_MINOR_V1_3_1 0x10030001 26#define MSM_DSI_6G_VER_MINOR_V1_3_1 0x10030001
27 27
28#define MSM_DSI_V2_VER_MINOR_8064 0x0
29
28#define DSI_6G_REG_SHIFT 4 30#define DSI_6G_REG_SHIFT 4
29 31
30struct msm_dsi_config { 32struct msm_dsi_config {