summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/fbdev/msm/Makefile2
-rw-r--r--drivers/video/fbdev/msm/mdss_dsi.h2
-rw-r--r--drivers/video/fbdev/msm/mdss_dsi_panel.c6
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_formats.h8
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_pp.h8
-rw-r--r--drivers/video/fbdev/msm/mdss_panel.h8
-rw-r--r--drivers/video/fbdev/msm/msm_mdss_io_8974.c32
7 files changed, 28 insertions, 38 deletions
diff --git a/drivers/video/fbdev/msm/Makefile b/drivers/video/fbdev/msm/Makefile
index fb7a6ba6be21..bf5779b0c275 100644
--- a/drivers/video/fbdev/msm/Makefile
+++ b/drivers/video/fbdev/msm/Makefile
@@ -22,9 +22,7 @@ mdss-mdp-objs += mdss_mdp_wfd.o
obj-$(CONFIG_FB_MSM_MDSS) += mdss-mdp.o
obj-$(CONFIG_FB_MSM_MDSS) += mdss_mdp_debug.o
-ifeq ($(CONFIG_ARCH_MSMTHULIUM),y)
mdss-mdp-objs += mdss_mdp_pp_v1_7.o
-endif
ifeq ($(CONFIG_FB_MSM_MDSS),y)
obj-$(CONFIG_DEBUG_FS) += mdss_debug.o mdss_debug_xlog.o
diff --git a/drivers/video/fbdev/msm/mdss_dsi.h b/drivers/video/fbdev/msm/mdss_dsi.h
index 1c8063b2545a..44537d96d861 100644
--- a/drivers/video/fbdev/msm/mdss_dsi.h
+++ b/drivers/video/fbdev/msm/mdss_dsi.h
@@ -53,7 +53,7 @@
#define MDSS_DSI_HW_REV_102 0x10020000 /* 8084 */
#define MDSS_DSI_HW_REV_103 0x10030000 /* 8994 */
#define MDSS_DSI_HW_REV_103_1 0x10030001 /* 8916/8936 */
-#define MDSS_DSI_HW_REV_104 0x10040000 /* thulium */
+#define MDSS_DSI_HW_REV_104 0x10040000 /* 8996 */
#define NONE_PANEL "none"
diff --git a/drivers/video/fbdev/msm/mdss_dsi_panel.c b/drivers/video/fbdev/msm/mdss_dsi_panel.c
index 62cd76a844fa..5f28e9f378de 100644
--- a/drivers/video/fbdev/msm/mdss_dsi_panel.c
+++ b/drivers/video/fbdev/msm/mdss_dsi_panel.c
@@ -1695,13 +1695,13 @@ static int mdss_panel_parse_dt(struct device_node *np,
for (i = 0; i < len; i++)
pinfo->mipi.dsi_phy_db.timing[i] = data[i];
- data = of_get_property(np, "qcom,mdss-dsi-panel-timings-thulium", &len);
+ data = of_get_property(np, "qcom,mdss-dsi-panel-timings-8996", &len);
if ((!data) || (len != 40)) {
- pr_debug("%s:%d, Unable to read thulium Phy lane timing settings",
+ pr_debug("%s:%d, Unable to read 8996 Phy lane timing settings",
__func__, __LINE__);
} else {
for (i = 0; i < len; i++)
- pinfo->mipi.dsi_phy_db.timing_thulium[i] = data[i];
+ pinfo->mipi.dsi_phy_db.timing_8996[i] = data[i];
}
pinfo->mipi.lp11_init = of_property_read_bool(np,
diff --git a/drivers/video/fbdev/msm/mdss_mdp_formats.h b/drivers/video/fbdev/msm/mdss_mdp_formats.h
index bc1f0f8a7892..c30b3bb9f811 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_formats.h
+++ b/drivers/video/fbdev/msm/mdss_mdp_formats.h
@@ -174,14 +174,14 @@ enum {
static struct mdss_fudge_factor ubwc_rt_factors[][UBWC_TOTAL_FORMATS] = {
/* RGB_565_UBWC | RGBA_8888_UBWC | YUV_H2V2_UBWC */
- {{1, 1} , {126, 100} , {123, 100} } , /* Thulium v0 */
- {{1, 1} , {126, 100} , {123, 100} } , /* Thulium v1,v2 */
+ {{1, 1} , {126, 100} , {123, 100} } , /* 8996 v0 */
+ {{1, 1} , {126, 100} , {123, 100} } , /* 8996 v1,v2 */
};
static struct mdss_fudge_factor ubwc_nrt_factors[][UBWC_TOTAL_FORMATS] = {
/* RGB_565_UBWC | RGBA_8888_UBWC | YUV_H2V2_UBWC */
- {{1, 1} , {146, 100} , {1, 1} } , /* Thulium v0 */
- {{1, 1} , {146, 100} , {128, 100} } , /* Thulium v1,v2 */
+ {{1, 1} , {146, 100} , {1, 1} } , /* 8996 v0 */
+ {{1, 1} , {146, 100} , {128, 100} } , /* 8996 v1,v2 */
};
/*
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pp.h b/drivers/video/fbdev/msm/mdss_mdp_pp.h
index 29e4db17b760..893599f87759 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_pp.h
+++ b/drivers/video/fbdev/msm/mdss_mdp_pp.h
@@ -160,15 +160,7 @@ struct mdss_pp_res_type {
void *pp_data_res;
};
-#ifdef CONFIG_ARCH_MSMTHULIUM
void *pp_get_driver_ops(struct mdp_pp_driver_ops *ops);
-#else
-static inline void *pp_get_driver_ops(struct mdp_pp_driver_ops *ops)
-{
- memset(ops, 0, sizeof(struct mdp_pp_driver_ops));
- return NULL;
-}
-#endif
static inline void pp_sts_set_split_bits(u32 *sts, u32 bits)
{
diff --git a/drivers/video/fbdev/msm/mdss_panel.h b/drivers/video/fbdev/msm/mdss_panel.h
index c0b298316eed..62b5e732705a 100644
--- a/drivers/video/fbdev/msm/mdss_panel.h
+++ b/drivers/video/fbdev/msm/mdss_panel.h
@@ -228,16 +228,16 @@ struct lcd_panel_info {
/* DSI PHY configuration */
struct mdss_dsi_phy_ctrl {
- char regulator[7]; /* thulium, 1 * 5 */
+ char regulator[7]; /* 8996, 1 * 5 */
char timing[12];
char ctrl[4];
- char strength[10]; /* thulium, 2 * 5 */
+ char strength[10]; /* 8996, 2 * 5 */
char bistctrl[6];
uint32_t pll[21];
- char lanecfg[45]; /* thulium, 4 * 5 */
+ char lanecfg[45]; /* 8996, 4 * 5 */
bool reg_ldo_mode;
- char timing_thulium[40];/* thulium, 8 * 5 */
+ char timing_8996[40];/* 8996, 8 * 5 */
char regulator_len;
char strength_len;
char lanecfg_len;
diff --git a/drivers/video/fbdev/msm/msm_mdss_io_8974.c b/drivers/video/fbdev/msm/msm_mdss_io_8974.c
index 7afcd082d0f5..d291c89b2075 100644
--- a/drivers/video/fbdev/msm/msm_mdss_io_8974.c
+++ b/drivers/video/fbdev/msm/msm_mdss_io_8974.c
@@ -40,9 +40,9 @@
#define SW_RESET_PLL BIT(0)
#define PWRDN_B BIT(7)
-/* thulium */
-#define DATALANE_OFFSET_FROM_BASE_THULIUM 0x100
-#define DATALANE_SIZE_THULIUM 0x80
+/* 8996 */
+#define DATALANE_OFFSET_FROM_BASE_8996 0x100
+#define DATALANE_SIZE_8996 0x80
#define DSIPHY_CMN_GLBL_TEST_CTRL 0x0018
#define DSIPHY_CMN_CTRL_0 0x001c
@@ -400,7 +400,7 @@ static void mdss_dsi_20nm_phy_config(struct mdss_dsi_ctrl_pdata *ctrl_pdata)
MIPI_OUTP((ctrl_pdata->phy_io.base) + MDSS_DSI_DSIPHY_CTRL_0, 0x7f);
}
-static void mdss_dsi_thulium_pll_source_standalone(
+static void mdss_dsi_8996_pll_source_standalone(
struct mdss_dsi_ctrl_pdata *ctrl)
{
u32 data;
@@ -415,7 +415,7 @@ static void mdss_dsi_thulium_pll_source_standalone(
MIPI_OUTP((ctrl->phy_io.base) + DSIPHY_CMN_GLBL_TEST_CTRL, data);
}
-static void mdss_dsi_thulium_pll_source_from_right(
+static void mdss_dsi_8996_pll_source_from_right(
struct mdss_dsi_ctrl_pdata *ctrl)
{
u32 data;
@@ -433,7 +433,7 @@ static void mdss_dsi_thulium_pll_source_from_right(
MIPI_OUTP((ctrl->phy_io.base) + DSIPHY_PLL_PLL_BANDGAP, 0x3);
}
-static void mdss_dsi_thulium_pll_source_from_left(
+static void mdss_dsi_8996_pll_source_from_left(
struct mdss_dsi_ctrl_pdata *ctrl)
{
u32 data;
@@ -448,7 +448,7 @@ static void mdss_dsi_thulium_pll_source_from_left(
MIPI_OUTP((ctrl->phy_io.base) + DSIPHY_CMN_GLBL_TEST_CTRL, data);
}
-static void mdss_dsi_thulium_phy_config(struct mdss_dsi_ctrl_pdata *ctrl)
+static void mdss_dsi_8996_phy_config(struct mdss_dsi_ctrl_pdata *ctrl)
{
struct mdss_dsi_phy_ctrl *pd;
int j, off, ln, cnt, ln_off;
@@ -484,8 +484,8 @@ static void mdss_dsi_thulium_phy_config(struct mdss_dsi_ctrl_pdata *ctrl)
* data lane size: 0x80
*/
base = ctrl->phy_io.base +
- DATALANE_OFFSET_FROM_BASE_THULIUM;
- base += (ln * DATALANE_SIZE_THULIUM); /* lane base */
+ DATALANE_OFFSET_FROM_BASE_8996;
+ base += (ln * DATALANE_SIZE_8996); /* lane base */
/* lane cfg, 4 * 5 */
cnt = 4;
@@ -503,7 +503,7 @@ static void mdss_dsi_thulium_phy_config(struct mdss_dsi_ctrl_pdata *ctrl)
/* phy timing, 8 * 5 */
cnt = 8;
ln_off = cnt * ln;
- ip = &pd->timing_thulium[ln_off];
+ ip = &pd->timing_8996[ln_off];
off = 0x18;
for (j = 0; j < cnt; j++, off += 4)
MIPI_OUTP(base + off, *ip++);
@@ -534,11 +534,11 @@ static void mdss_dsi_thulium_phy_config(struct mdss_dsi_ctrl_pdata *ctrl)
if (mdss_dsi_split_display_enabled()) {
if (mdss_dsi_is_left_ctrl(ctrl))
- mdss_dsi_thulium_pll_source_from_left(ctrl);
+ mdss_dsi_8996_pll_source_from_left(ctrl);
else
- mdss_dsi_thulium_pll_source_from_right(ctrl);
+ mdss_dsi_8996_pll_source_from_right(ctrl);
} else {
- mdss_dsi_thulium_pll_source_standalone(ctrl);
+ mdss_dsi_8996_pll_source_standalone(ctrl);
}
wmb(); /* make sure registers committed */
@@ -556,14 +556,14 @@ static void mdss_dsi_20nm_phy_init(struct mdss_dsi_ctrl_pdata *ctrl_pdata)
mdss_dsi_20nm_phy_config(ctrl_pdata);
}
-static void mdss_dsi_thulium_phy_init(struct mdss_dsi_ctrl_pdata *ctrl_pdata)
+static void mdss_dsi_8996_phy_init(struct mdss_dsi_ctrl_pdata *ctrl_pdata)
{
if (!ctrl_pdata) {
pr_err("%s: Invalid input data\n", __func__);
return;
}
- mdss_dsi_thulium_phy_config(ctrl_pdata);
+ mdss_dsi_8996_phy_config(ctrl_pdata);
}
static void mdss_dsi_phy_init(struct mdss_dsi_ctrl_pdata *ctrl)
@@ -575,7 +575,7 @@ static void mdss_dsi_phy_init(struct mdss_dsi_ctrl_pdata *ctrl)
switch (ctrl->hw_rev) {
case MDSS_DSI_HW_REV_104:
- mdss_dsi_thulium_phy_init(ctrl);
+ mdss_dsi_8996_phy_init(ctrl);
break;
case MDSS_DSI_HW_REV_103:
mdss_dsi_20nm_phy_init(ctrl);
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-20 23:58:37 +0000