fbdev: msm: rename function in mdss_io_util
Rename function in mdss_io_util and resolve conflict with
function defined in sde_io_util.
Change-Id: I558bb25cbb26ff1ca2b4f79a0e98162bb1992241
Signed-off-by: Sachin Bhayare <sachin.bhayare@codeaurora.org>
diff --git a/drivers/video/fbdev/msm/Makefile b/drivers/video/fbdev/msm/Makefile
index 2c3f0ca..d69876c 100644
--- a/drivers/video/fbdev/msm/Makefile
+++ b/drivers/video/fbdev/msm/Makefile
@@ -21,6 +21,7 @@
mdss-mdp-objs += mdss_mdp_cdm.o
mdss-mdp-objs += mdss_smmu.o
mdss-mdp-objs += mdss_mdp_wfd.o
+mdss-mdp-objs += mdss_io_util.o
obj-$(CONFIG_FB_MSM_MDSS) += mdss-mdp.o
obj-$(CONFIG_FB_MSM_MDSS) += mdss_mdp_debug.o
diff --git a/drivers/video/fbdev/msm/dsi_host_v2.c b/drivers/video/fbdev/msm/dsi_host_v2.c
index 2782702..33775ec 100644
--- a/drivers/video/fbdev/msm/dsi_host_v2.c
+++ b/drivers/video/fbdev/msm/dsi_host_v2.c
@@ -1114,7 +1114,7 @@
if (!pdata->panel_info.dynamic_switch_pending) {
for (i = 0; !ret && (i < DSI_MAX_PM); i++) {
- ret = msm_dss_enable_vreg(
+ ret = msm_mdss_enable_vreg(
ctrl_pdata->power_data[i].vreg_config,
ctrl_pdata->power_data[i].num_vreg, 1);
if (ret) {
@@ -1215,7 +1215,7 @@
error_vreg:
if (ret) {
for (; i >= 0; i--)
- msm_dss_enable_vreg(
+ msm_mdss_enable_vreg(
ctrl_pdata->power_data[i].vreg_config,
ctrl_pdata->power_data[i].num_vreg, 0);
}
@@ -1250,7 +1250,7 @@
if (!pdata->panel_info.dynamic_switch_pending) {
for (i = DSI_MAX_PM - 1; i >= 0; i--) {
- ret = msm_dss_enable_vreg(
+ ret = msm_mdss_enable_vreg(
ctrl_pdata->power_data[i].vreg_config,
ctrl_pdata->power_data[i].num_vreg, 0);
if (ret)
@@ -1287,7 +1287,7 @@
pinfo = &pdata->panel_info;
mutex_lock(&ctrl_pdata->mutex);
for (i = 0; !ret && (i < DSI_MAX_PM); i++) {
- ret = msm_dss_enable_vreg(
+ ret = msm_mdss_enable_vreg(
ctrl_pdata->power_data[i].vreg_config,
ctrl_pdata->power_data[i].num_vreg, 1);
if (ret) {
@@ -1314,7 +1314,7 @@
error_vreg:
if (ret) {
for (; i >= 0; i--)
- msm_dss_enable_vreg(
+ msm_mdss_enable_vreg(
ctrl_pdata->power_data[i].vreg_config,
ctrl_pdata->power_data[i].num_vreg, 0);
}
diff --git a/drivers/video/fbdev/msm/dsi_io_v2.c b/drivers/video/fbdev/msm/dsi_io_v2.c
index dd2e308..28441b6 100644
--- a/drivers/video/fbdev/msm/dsi_io_v2.c
+++ b/drivers/video/fbdev/msm/dsi_io_v2.c
@@ -50,7 +50,7 @@
}
}
-int msm_dsi_io_init(struct platform_device *pdev, struct dss_module_power *mp)
+int msm_dsi_io_init(struct platform_device *pdev, struct mdss_module_power *mp)
{
int rc;
@@ -67,7 +67,7 @@
return rc;
}
- rc = msm_dss_config_vreg(&pdev->dev, mp->vreg_config,
+ rc = msm_mdss_config_vreg(&pdev->dev, mp->vreg_config,
mp->num_vreg, 1);
if (rc) {
pr_err("fail to initialize DSI regulator\n");
@@ -78,11 +78,11 @@
}
void msm_dsi_io_deinit(struct platform_device *pdev,
- struct dss_module_power *mp)
+ struct mdss_module_power *mp)
{
if (dsi_io_private) {
msm_dsi_clk_deinit();
- msm_dss_config_vreg(&pdev->dev, mp->vreg_config,
+ msm_mdss_config_vreg(&pdev->dev, mp->vreg_config,
mp->num_vreg, 0);
kfree(dsi_io_private);
dsi_io_private = NULL;
diff --git a/drivers/video/fbdev/msm/dsi_io_v2.h b/drivers/video/fbdev/msm/dsi_io_v2.h
index dd9adf9..d0227ec 100644
--- a/drivers/video/fbdev/msm/dsi_io_v2.h
+++ b/drivers/video/fbdev/msm/dsi_io_v2.h
@@ -18,10 +18,10 @@
void msm_dsi_ahb_ctrl(int enable);
int msm_dsi_io_init(struct platform_device *dev,
- struct dss_module_power *mp);
+ struct mdss_module_power *mp);
void msm_dsi_io_deinit(struct platform_device *dev,
- struct dss_module_power *mp);
+ struct mdss_module_power *mp);
int msm_dsi_clk_init(struct platform_device *dev);
diff --git a/drivers/video/fbdev/msm/dsi_v2.c b/drivers/video/fbdev/msm/dsi_v2.c
index 92d512a..74c0726 100644
--- a/drivers/video/fbdev/msm/dsi_v2.c
+++ b/drivers/video/fbdev/msm/dsi_v2.c
@@ -237,7 +237,7 @@
}
static void mdss_dsi_put_dt_vreg_data(struct device *dev,
- struct dss_module_power *module_power)
+ struct mdss_module_power *module_power)
{
if (!module_power) {
pr_err("%s: invalid input\n", __func__);
@@ -252,7 +252,7 @@
}
static int mdss_dsi_get_dt_vreg_data(struct device *dev,
- struct dss_module_power *mp, enum dsi_pm_type module)
+ struct mdss_module_power *mp, enum dsi_pm_type module)
{
int i = 0, rc = 0;
u32 tmp = 0;
@@ -287,7 +287,7 @@
pr_debug("%s: vreg found. count=%d\n", __func__, mp->num_vreg);
}
- mp->vreg_config = devm_kzalloc(dev, sizeof(struct dss_vreg) *
+ mp->vreg_config = devm_kzalloc(dev, sizeof(struct mdss_vreg) *
mp->num_vreg, GFP_KERNEL);
if (!mp->vreg_config) {
rc = -ENOMEM;
diff --git a/drivers/video/fbdev/msm/mdss.h b/drivers/video/fbdev/msm/mdss.h
index 5d9e612..17bad06 100644
--- a/drivers/video/fbdev/msm/mdss.h
+++ b/drivers/video/fbdev/msm/mdss.h
@@ -209,7 +209,7 @@
struct mdss_smmu_client {
struct device *dev;
struct dma_iommu_mapping *mmu_mapping;
- struct dss_module_power mp;
+ struct mdss_module_power mp;
struct reg_bus_client *reg_bus_clt;
bool domain_attached;
bool handoff_pending;
@@ -283,9 +283,9 @@
struct mdss_panel_data *pdata;
struct platform_device *pdev;
- struct dss_io_data mdss_io;
- struct dss_io_data vbif_io;
- struct dss_io_data vbif_nrt_io;
+ struct mdss_io_data mdss_io;
+ struct mdss_io_data vbif_io;
+ struct mdss_io_data vbif_nrt_io;
char __iomem *mdp_base;
struct mdss_smmu_client mdss_smmu[MDSS_IOMMU_MAX_DOMAIN];
@@ -590,14 +590,14 @@
}
#define MDSS_VBIF_WRITE(mdata, offset, value, nrt_vbif) \
- (nrt_vbif ? dss_reg_w(&mdata->vbif_nrt_io, offset, value, 0) :\
- dss_reg_w(&mdata->vbif_io, offset, value, 0))
+ (nrt_vbif ? mdss_reg_w(&mdata->vbif_nrt_io, offset, value, 0) :\
+ mdss_reg_w(&mdata->vbif_io, offset, value, 0))
#define MDSS_VBIF_READ(mdata, offset, nrt_vbif) \
- (nrt_vbif ? dss_reg_r(&mdata->vbif_nrt_io, offset, 0) :\
- dss_reg_r(&mdata->vbif_io, offset, 0))
+ (nrt_vbif ? mdss_reg_r(&mdata->vbif_nrt_io, offset, 0) :\
+ mdss_reg_r(&mdata->vbif_io, offset, 0))
#define MDSS_REG_WRITE(mdata, offset, value) \
- dss_reg_w(&mdata->mdss_io, offset, value, 0)
+ mdss_reg_w(&mdata->mdss_io, offset, value, 0)
#define MDSS_REG_READ(mdata, offset) \
- dss_reg_r(&mdata->mdss_io, offset, 0)
+ mdss_reg_r(&mdata->mdss_io, offset, 0)
#endif /* MDSS_H */
diff --git a/drivers/video/fbdev/msm/mdss_debug.h b/drivers/video/fbdev/msm/mdss_debug.h
index 83342e4..0d482c0 100644
--- a/drivers/video/fbdev/msm/mdss_debug.h
+++ b/drivers/video/fbdev/msm/mdss_debug.h
@@ -225,7 +225,7 @@
int mdss_dump_misr_data(char **buf, u32 size);
static inline int mdss_debug_register_io(const char *name,
- struct dss_io_data *io_data, struct mdss_debug_base **dbg_blk)
+ struct mdss_io_data *io_data, struct mdss_debug_base **dbg_blk)
{
return mdss_debug_register_base(name, io_data->base, io_data->len,
dbg_blk);
diff --git a/drivers/video/fbdev/msm/mdss_dsi.c b/drivers/video/fbdev/msm/mdss_dsi.c
index c8d7425..d70c1e8 100644
--- a/drivers/video/fbdev/msm/mdss_dsi.c
+++ b/drivers/video/fbdev/msm/mdss_dsi.c
@@ -254,14 +254,14 @@
}
for (i = DSI_CORE_PM; !rc && (i < DSI_MAX_PM); i++) {
- rc = msm_dss_config_vreg(&pdev->dev,
+ rc = msm_mdss_config_vreg(&pdev->dev,
sdata->power_data[i].vreg_config,
sdata->power_data[i].num_vreg, 1);
if (rc) {
pr_err("%s: failed to init vregs for %s\n",
__func__, __mdss_dsi_pm_name(i));
for (j = i-1; j >= DSI_CORE_PM; j--) {
- msm_dss_config_vreg(&pdev->dev,
+ msm_mdss_config_vreg(&pdev->dev,
sdata->power_data[j].vreg_config,
sdata->power_data[j].num_vreg, 0);
}
@@ -294,7 +294,7 @@
if (mdss_dsi_pinctrl_set_state(ctrl_pdata, false))
pr_debug("reset disable: pinctrl not enabled\n");
- ret = msm_dss_enable_vreg(
+ ret = msm_mdss_enable_vreg(
ctrl_pdata->panel_power_data.vreg_config,
ctrl_pdata->panel_power_data.num_vreg, 0);
if (ret)
@@ -318,7 +318,7 @@
ctrl_pdata = container_of(pdata, struct mdss_dsi_ctrl_pdata,
panel_data);
- ret = msm_dss_enable_vreg(
+ ret = msm_mdss_enable_vreg(
ctrl_pdata->panel_power_data.vreg_config,
ctrl_pdata->panel_power_data.num_vreg, 1);
if (ret) {
@@ -353,13 +353,6 @@
return 0;
}
-int msm_dss_config_vreg_opt_mode(struct dss_vreg *in_vreg,
- int num_vreg, enum dss_vreg_mode mode)
-{
-/* stub: FIX ME.Should be sourced from mdss_io_util.c */
- return 0;
-}
-
static int mdss_dsi_panel_power_ulp(struct mdss_panel_data *pdata,
int enable)
{
@@ -386,11 +379,11 @@
if (i == DSI_CORE_PM)
continue;
if (i == DSI_PANEL_PM)
- ret = msm_dss_config_vreg_opt_mode(
+ ret = msm_mdss_config_vreg_opt_mode(
ctrl_pdata->panel_power_data.vreg_config,
ctrl_pdata->panel_power_data.num_vreg, mode);
else
- ret = msm_dss_config_vreg_opt_mode(
+ ret = msm_mdss_config_vreg_opt_mode(
sdata->power_data[i].vreg_config,
sdata->power_data[i].num_vreg, mode);
if (ret) {
@@ -403,7 +396,7 @@
if (ret) {
mode = enable ? DSS_REG_MODE_ENABLE : DSS_REG_MODE_ULP;
for (; i >= 0; i--)
- msm_dss_config_vreg_opt_mode(
+ msm_mdss_config_vreg_opt_mode(
ctrl_pdata->power_data[i].vreg_config,
ctrl_pdata->power_data[i].num_vreg, mode);
}
@@ -486,7 +479,7 @@
}
static void mdss_dsi_put_dt_vreg_data(struct device *dev,
- struct dss_module_power *module_power)
+ struct mdss_module_power *module_power)
{
if (!module_power) {
pr_err("%s: invalid input\n", __func__);
@@ -501,7 +494,7 @@
}
static int mdss_dsi_get_dt_vreg_data(struct device *dev,
- struct device_node *of_node, struct dss_module_power *mp,
+ struct device_node *of_node, struct mdss_module_power *mp,
enum dsi_pm_type module)
{
int i = 0, rc = 0;
@@ -543,7 +536,7 @@
pr_debug("%s: vreg found. count=%d\n", __func__, mp->num_vreg);
}
- mp->vreg_config = devm_kzalloc(dev, sizeof(struct dss_vreg) *
+ mp->vreg_config = devm_kzalloc(dev, sizeof(struct mdss_vreg) *
mp->num_vreg, GFP_KERNEL);
if (!mp->vreg_config) {
rc = -ENOMEM;
@@ -3460,7 +3453,7 @@
goto res_release;
for (i = (DSI_MAX_PM - 1); i >= DSI_CORE_PM; i--) {
- if (msm_dss_config_vreg(&pdev->dev,
+ if (msm_mdss_config_vreg(&pdev->dev,
sdata->power_data[i].vreg_config,
sdata->power_data[i].num_vreg, 1) < 0)
pr_err("%s: failed to de-init vregs for %s\n",
@@ -3826,7 +3819,7 @@
mdss_dsi_pm_qos_remove_request(ctrl_pdata->shared_data);
- if (msm_dss_config_vreg(&pdev->dev,
+ if (msm_mdss_config_vreg(&pdev->dev,
ctrl_pdata->panel_power_data.vreg_config,
ctrl_pdata->panel_power_data.num_vreg, 1) < 0)
pr_err("%s: failed to de-init vregs for %s\n",
@@ -3834,9 +3827,9 @@
mdss_dsi_put_dt_vreg_data(&pdev->dev, &ctrl_pdata->panel_power_data);
mfd = platform_get_drvdata(pdev);
- msm_dss_iounmap(&ctrl_pdata->mmss_misc_io);
- msm_dss_iounmap(&ctrl_pdata->phy_io);
- msm_dss_iounmap(&ctrl_pdata->ctrl_io);
+ msm_mdss_iounmap(&ctrl_pdata->mmss_misc_io);
+ msm_mdss_iounmap(&ctrl_pdata->phy_io);
+ msm_mdss_iounmap(&ctrl_pdata->ctrl_io);
mdss_dsi_debugfs_cleanup(ctrl_pdata);
if (ctrl_pdata->workq)
@@ -3879,7 +3872,7 @@
return -EPERM;
}
- rc = msm_dss_ioremap_byname(pdev, &ctrl->ctrl_io, "dsi_ctrl");
+ rc = msm_mdss_ioremap_byname(pdev, &ctrl->ctrl_io, "dsi_ctrl");
if (rc) {
pr_err("%s:%d unable to remap dsi ctrl resources\n",
__func__, __LINE__);
@@ -3889,14 +3882,14 @@
ctrl->ctrl_base = ctrl->ctrl_io.base;
ctrl->reg_size = ctrl->ctrl_io.len;
- rc = msm_dss_ioremap_byname(pdev, &ctrl->phy_io, "dsi_phy");
+ rc = msm_mdss_ioremap_byname(pdev, &ctrl->phy_io, "dsi_phy");
if (rc) {
pr_err("%s:%d unable to remap dsi phy resources\n",
__func__, __LINE__);
return rc;
}
- rc = msm_dss_ioremap_byname(pdev, &ctrl->phy_regulator_io,
+ rc = msm_mdss_ioremap_byname(pdev, &ctrl->phy_regulator_io,
"dsi_phy_regulator");
if (rc)
pr_debug("%s:%d unable to remap dsi phy regulator resources\n",
@@ -3910,7 +3903,7 @@
__func__, ctrl->ctrl_base, ctrl->reg_size, ctrl->phy_io.base,
ctrl->phy_io.len);
- rc = msm_dss_ioremap_byname(pdev, &ctrl->mmss_misc_io,
+ rc = msm_mdss_ioremap_byname(pdev, &ctrl->mmss_misc_io,
"mmss_misc_phys");
if (rc) {
pr_debug("%s:%d mmss_misc IO remap failed\n",
@@ -4183,7 +4176,7 @@
return rc;
}
- rc = msm_dss_config_vreg(&ctrl_pdev->dev,
+ rc = msm_mdss_config_vreg(&ctrl_pdev->dev,
ctrl_pdata->panel_power_data.vreg_config,
ctrl_pdata->panel_power_data.num_vreg, 1);
if (rc) {
@@ -4265,7 +4258,7 @@
sdata = ctrl_pdata->shared_data;
if (pinfo->ulps_suspend_enabled) {
- rc = msm_dss_enable_vreg(
+ rc = msm_mdss_enable_vreg(
sdata->power_data[DSI_PHY_PM].vreg_config,
sdata->power_data[DSI_PHY_PM].num_vreg, 1);
if (rc) {
diff --git a/drivers/video/fbdev/msm/mdss_dsi.h b/drivers/video/fbdev/msm/mdss_dsi.h
index ea38c0d..60bc455 100644
--- a/drivers/video/fbdev/msm/mdss_dsi.h
+++ b/drivers/video/fbdev/msm/mdss_dsi.h
@@ -272,7 +272,7 @@
struct clk *pixel1_parent;
/* DSI core regulators */
- struct dss_module_power power_data[DSI_MAX_PM];
+ struct mdss_module_power power_data[DSI_MAX_PM];
/* Shared mutex for DSI PHY regulator */
struct mutex phy_reg_lock;
@@ -407,10 +407,10 @@
void (*switch_mode)(struct mdss_panel_data *pdata, int mode);
struct mdss_panel_data panel_data;
unsigned char *ctrl_base;
- struct dss_io_data ctrl_io;
- struct dss_io_data mmss_misc_io;
- struct dss_io_data phy_io;
- struct dss_io_data phy_regulator_io;
+ struct mdss_io_data ctrl_io;
+ struct mdss_io_data mmss_misc_io;
+ struct mdss_io_data phy_io;
+ struct mdss_io_data phy_regulator_io;
int reg_size;
u32 flags;
struct clk *byte_clk;
@@ -459,8 +459,8 @@
u32 pclk_rate_bkp;
u32 byte_clk_rate_bkp;
bool refresh_clk_rate; /* flag to recalculate clk_rate */
- struct dss_module_power panel_power_data;
- struct dss_module_power power_data[DSI_MAX_PM]; /* for 8x10 */
+ struct mdss_module_power panel_power_data;
+ struct mdss_module_power power_data[DSI_MAX_PM]; /* for 8x10 */
u32 dsi_irq_mask;
struct mdss_hw *dsi_hw;
struct mdss_intf_recovery *recovery;
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_audio.c b/drivers/video/fbdev/msm/mdss_hdmi_audio.c
index 0effbcb..446e8b4 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_audio.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_audio.c
@@ -63,7 +63,7 @@
};
struct hdmi_audio {
- struct dss_io_data *io;
+ struct mdss_io_data *io;
struct msm_hdmi_audio_setup_params params;
struct extcon_dev sdev;
u32 pclk;
@@ -143,7 +143,7 @@
static void hdmi_audio_acr_enable(struct hdmi_audio *audio)
{
- struct dss_io_data *io;
+ struct mdss_io_data *io;
struct hdmi_audio_acr acr;
struct msm_hdmi_audio_setup_params *params;
u32 pclk, layout, multiplier = 1, sample_rate;
@@ -260,7 +260,7 @@
static void hdmi_audio_infoframe_setup(struct hdmi_audio *audio, bool enabled)
{
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
u32 channels, channel_allocation, level_shift, down_mix, layout;
u32 hdmi_debug_reg = 0, audio_info_0_reg = 0, audio_info_1_reg = 0;
u32 audio_info_ctrl_reg, aud_pck_ctrl_2_reg;
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_audio.h b/drivers/video/fbdev/msm/mdss_hdmi_audio.h
index 7b33cb8..2449123 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_audio.h
+++ b/drivers/video/fbdev/msm/mdss_hdmi_audio.h
@@ -62,7 +62,7 @@
* Defines the data needed to be provided while initializing audio module
*/
struct hdmi_audio_init_data {
- struct dss_io_data *io;
+ struct mdss_io_data *io;
struct hdmi_audio_ops *ops;
};
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_cec.c b/drivers/video/fbdev/msm/mdss_hdmi_cec.c
index f1be313..f15272e 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_cec.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_cec.c
@@ -52,7 +52,7 @@
u32 frame_retransmit = RETRANSMIT_MAX_NUM;
bool frame_type;
unsigned long flags;
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
struct hdmi_cec_ctrl *cec_ctrl = (struct hdmi_cec_ctrl *)data;
if (!cec_ctrl || !cec_ctrl->init_data.io || !msg) {
@@ -169,7 +169,7 @@
int i;
u32 data;
struct hdmi_cec_ctrl *cec_ctrl = NULL;
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
struct cec_msg msg;
struct cec_cbs *cbs;
@@ -262,7 +262,7 @@
int rc = 0;
u32 cec_intr, cec_status;
unsigned long flags;
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
struct hdmi_cec_ctrl *cec_ctrl = (struct hdmi_cec_ctrl *)input;
if (!cec_ctrl || !cec_ctrl->init_data.io) {
@@ -368,7 +368,7 @@
{
int ret = 0;
u32 hdmi_hw_version, reg_val;
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
struct hdmi_cec_ctrl *cec_ctrl = (struct hdmi_cec_ctrl *)input;
struct mdss_panel_info *pinfo;
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_cec.h b/drivers/video/fbdev/msm/mdss_hdmi_cec.h
index 57a7664..de4bb35 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_cec.h
+++ b/drivers/video/fbdev/msm/mdss_hdmi_cec.h
@@ -30,7 +30,7 @@
*/
struct hdmi_cec_init_data {
struct workqueue_struct *workq;
- struct dss_io_data *io;
+ struct mdss_io_data *io;
struct mdss_panel_info *pinfo;
struct cec_cbs *cbs;
struct cec_ops *ops;
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_hdcp.c b/drivers/video/fbdev/msm/mdss_hdmi_hdcp.c
index e88884d..41c6844 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_hdcp.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_hdcp.c
@@ -87,7 +87,7 @@
int hdcp_ddc_status;
int failure;
int nack0;
- struct dss_io_data *io;
+ struct mdss_io_data *io;
if (!hdcp_ctrl || !hdcp_ctrl->init_data.core_io) {
DEV_ERR("%s: invalid input\n", __func__);
@@ -166,7 +166,7 @@
static void hdmi_hdcp_hw_ddc_clean(struct hdmi_hdcp_ctrl *hdcp_ctrl)
{
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
u32 hdcp_ddc_status, ddc_hw_status;
u32 ddc_xfer_done, ddc_xfer_req;
u32 ddc_hw_req, ddc_hw_not_idle;
@@ -254,8 +254,8 @@
u32 ksv_lsb_addr, ksv_msb_addr;
u32 aksv_lsb, aksv_msb;
u8 aksv[5];
- struct dss_io_data *io;
- struct dss_io_data *qfprom_io;
+ struct mdss_io_data *io;
+ struct mdss_io_data *qfprom_io;
struct hdmi_hdcp_ctrl *hdcp_ctrl = input;
if (!hdcp_ctrl || !hdcp_ctrl->init_data.core_io ||
@@ -352,8 +352,8 @@
u32 link0_an_0, link0_an_1;
u32 timeout_count;
bool is_match;
- struct dss_io_data *io;
- struct dss_io_data *hdcp_io;
+ struct mdss_io_data *io;
+ struct mdss_io_data *hdcp_io;
u8 aksv[5], *bksv = NULL;
u8 an[8];
u8 bcaps = 0;
@@ -678,7 +678,7 @@
static int read_write_v_h(struct hdmi_hdcp_ctrl *hdcp_ctrl,
struct hdmi_tx_ddc_data ddc_data,
- struct dss_io_data *io, int off, char *name,
+ struct mdss_io_data *io, int off, char *name,
u32 reg, bool wr)
{
int rc = 0;
@@ -715,7 +715,7 @@
int rc = 0;
u8 buf[4];
struct hdmi_tx_ddc_data ddc_data;
- struct dss_io_data *io;
+ struct mdss_io_data *io;
struct scm_hdcp_req scm_buf[SCM_HDCP_MAX_REG];
u32 phy_addr;
@@ -774,7 +774,7 @@
goto error;
}
} else if (hdcp_ctrl->hdmi_tx_ver_4) {
- struct dss_io_data *hdcp_io = hdcp_ctrl->init_data.hdcp_io;
+ struct mdss_io_data *hdcp_io = hdcp_ctrl->init_data.hdcp_io;
/* Read V'.HO 4 Byte at offset 0x20 */
if (read_write_v_h(hdcp_ctrl, ddc_data, hdcp_io, 0x20, "V' H0",
@@ -843,7 +843,7 @@
u16 bstatus, max_devs_exceeded = 0, max_cascade_exceeded = 0;
u32 link0_status;
u32 ksv_bytes;
- struct dss_io_data *io;
+ struct mdss_io_data *io;
struct scm_hdcp_req scm_buf[SCM_HDCP_MAX_REG];
u32 phy_addr;
@@ -1247,7 +1247,7 @@
struct delayed_work *dw = to_delayed_work(work);
struct hdmi_hdcp_ctrl *hdcp_ctrl = container_of(dw,
struct hdmi_hdcp_ctrl, hdcp_auth_work);
- struct dss_io_data *io;
+ struct mdss_io_data *io;
if (!hdcp_ctrl) {
DEV_ERR("%s: invalid input\n", __func__);
@@ -1353,7 +1353,7 @@
int hdmi_hdcp_reauthenticate(void *input)
{
struct hdmi_hdcp_ctrl *hdcp_ctrl = (struct hdmi_hdcp_ctrl *)input;
- struct dss_io_data *io;
+ struct mdss_io_data *io;
u32 hdmi_hw_version;
u32 ret = 0;
@@ -1400,7 +1400,7 @@
void hdmi_hdcp_off(void *input)
{
struct hdmi_hdcp_ctrl *hdcp_ctrl = (struct hdmi_hdcp_ctrl *)input;
- struct dss_io_data *io;
+ struct mdss_io_data *io;
int rc = 0;
if (!hdcp_ctrl || !hdcp_ctrl->init_data.core_io) {
@@ -1453,7 +1453,7 @@
{
struct hdmi_hdcp_ctrl *hdcp_ctrl = (struct hdmi_hdcp_ctrl *)input;
int rc = 0;
- struct dss_io_data *io;
+ struct mdss_io_data *io;
u32 hdcp_int_val;
if (!hdcp_ctrl || !hdcp_ctrl->init_data.core_io) {
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_hdcp.h b/drivers/video/fbdev/msm/mdss_hdmi_hdcp.h
index 2098943..2276009 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_hdcp.h
+++ b/drivers/video/fbdev/msm/mdss_hdmi_hdcp.h
@@ -28,9 +28,9 @@
};
struct hdmi_hdcp_init_data {
- struct dss_io_data *core_io;
- struct dss_io_data *qfprom_io;
- struct dss_io_data *hdcp_io;
+ struct mdss_io_data *core_io;
+ struct mdss_io_data *qfprom_io;
+ struct mdss_io_data *hdcp_io;
struct mutex *mutex;
struct kobject *sysfs_kobj;
struct workqueue_struct *workq;
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_panel.c b/drivers/video/fbdev/msm/mdss_hdmi_panel.c
index 9e082b3a..3823d3b 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_panel.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_panel.c
@@ -108,7 +108,7 @@
};
struct hdmi_panel {
- struct dss_io_data *io;
+ struct mdss_io_data *io;
struct hdmi_util_ds_data *ds_data;
struct hdmi_panel_data *data;
struct hdmi_video_config vid_cfg;
@@ -275,7 +275,7 @@
u32 total_h, start_h, end_h;
u32 total_v, start_v, end_v;
u32 div = 0;
- struct dss_io_data *io = panel->io;
+ struct mdss_io_data *io = panel->io;
struct msm_hdmi_mode_timing_info *timing;
timing = panel->vid_cfg.timing;
@@ -342,7 +342,7 @@
u8 avi_iframe[AVI_MAX_DATA_BYTES] = {0};
u8 checksum;
u32 sum, reg_val;
- struct dss_io_data *io = panel->io;
+ struct mdss_io_data *io = panel->io;
struct hdmi_avi_infoframe_config *avi;
struct msm_hdmi_mode_timing_info *timing;
@@ -477,7 +477,7 @@
u32 sum, reg_val;
u32 hdmi_vic, hdmi_video_format, s3d_struct = 0;
struct hdmi_panel *panel = input;
- struct dss_io_data *io = panel->io;
+ struct mdss_io_data *io = panel->io;
/* HDMI Spec 1.4a Table 8-10 */
vs_iframe[0] = 0x81; /* type */
@@ -564,7 +564,7 @@
u32 packet_control = 0;
u8 *vendor_name = NULL;
u8 *product_description = NULL;
- struct dss_io_data *io = panel->io;
+ struct mdss_io_data *io = panel->io;
vendor_name = panel->spd_vendor_name;
product_description = panel->spd_product_description;
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_panel.h b/drivers/video/fbdev/msm/mdss_hdmi_panel.h
index 4685b4e..50e168a 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_panel.h
+++ b/drivers/video/fbdev/msm/mdss_hdmi_panel.h
@@ -73,7 +73,7 @@
* @version: hardware version of the hdmi tx
*/
struct hdmi_panel_init_data {
- struct dss_io_data *io;
+ struct mdss_io_data *io;
struct hdmi_util_ds_data *ds_data;
struct hdmi_panel_data *panel_data;
struct hdmi_tx_ddc_ctrl *ddc;
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.c b/drivers/video/fbdev/msm/mdss_hdmi_tx.c
index d9a84ad..4f2bb09 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_tx.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.c
@@ -117,23 +117,23 @@
.irq_handler = hdmi_tx_isr,
};
-static struct dss_gpio hpd_gpio_config[] = {
+static struct mdss_gpio hpd_gpio_config[] = {
{0, 1, COMPATIBLE_NAME "-hpd"},
{0, 1, COMPATIBLE_NAME "-mux-en"},
{0, 0, COMPATIBLE_NAME "-mux-sel"},
{0, 1, COMPATIBLE_NAME "-mux-lpm"}
};
-static struct dss_gpio ddc_gpio_config[] = {
+static struct mdss_gpio ddc_gpio_config[] = {
{0, 1, COMPATIBLE_NAME "-ddc-mux-sel"},
{0, 1, COMPATIBLE_NAME "-ddc-clk"},
{0, 1, COMPATIBLE_NAME "-ddc-data"}
};
-static struct dss_gpio core_gpio_config[] = {
+static struct mdss_gpio core_gpio_config[] = {
};
-static struct dss_gpio cec_gpio_config[] = {
+static struct mdss_gpio cec_gpio_config[] = {
{0, 1, COMPATIBLE_NAME "-cec"}
};
@@ -152,7 +152,7 @@
{
int rc;
int reg_val;
- struct dss_io_data *io;
+ struct mdss_io_data *io;
rc = hdmi_tx_enable_power(hdmi_ctrl, HDMI_TX_HPD_PM, true);
if (rc) {
@@ -392,7 +392,7 @@
{
u64 status = 0;
u32 wait_for_vote = 50;
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
if (!hdmi_ctrl) {
DEV_ERR("%s: invalid input\n", __func__);
@@ -483,7 +483,7 @@
static int hdmi_tx_config_5v(struct hdmi_tx_ctrl *hdmi_ctrl, bool enable)
{
- struct dss_module_power *pd = NULL;
+ struct mdss_module_power *pd = NULL;
int ret = 0;
if (!hdmi_ctrl) {
@@ -644,7 +644,7 @@
static int hdmi_tx_update_pixel_clk(struct hdmi_tx_ctrl *hdmi_ctrl)
{
- struct dss_module_power *power_data = NULL;
+ struct mdss_module_power *power_data = NULL;
struct mdss_panel_info *pinfo;
int rc = 0;
@@ -675,7 +675,7 @@
DEV_DBG("%s: rate %ld\n", __func__, power_data->clk_config->rate);
- msm_dss_clk_set_rate(power_data->clk_config, power_data->num_clk);
+ msm_mdss_clk_set_rate(power_data->clk_config, power_data->num_clk);
end:
return rc;
}
@@ -736,7 +736,7 @@
{
int sim_mode, rc;
struct hdmi_tx_ctrl *hdmi_ctrl = NULL;
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
hdmi_ctrl = hdmi_tx_get_drvdata_from_sysfs_dev(dev);
@@ -1222,7 +1222,7 @@
{
int read, ret;
struct hdmi_tx_ctrl *hdmi_ctrl = NULL;
- struct dss_module_power *pd = NULL;
+ struct mdss_module_power *pd = NULL;
hdmi_ctrl = hdmi_tx_get_drvdata_from_sysfs_dev(dev);
if (!hdmi_ctrl) {
@@ -1333,7 +1333,7 @@
static int hdmi_tx_config_avmute(struct hdmi_tx_ctrl *hdmi_ctrl, bool set)
{
- struct dss_io_data *io;
+ struct mdss_io_data *io;
u32 av_mute_status;
bool av_pkt_en = false;
@@ -1374,7 +1374,7 @@
static bool hdmi_tx_is_encryption_set(struct hdmi_tx_ctrl *hdmi_ctrl)
{
- struct dss_io_data *io;
+ struct mdss_io_data *io;
bool enc_en = true;
u32 reg_val;
@@ -1960,7 +1960,7 @@
static inline u32 hdmi_tx_is_controller_on(struct hdmi_tx_ctrl *hdmi_ctrl)
{
- struct dss_io_data *io = &hdmi_ctrl->pdata.io[HDMI_TX_CORE_IO];
+ struct mdss_io_data *io = &hdmi_ctrl->pdata.io[HDMI_TX_CORE_IO];
return DSS_REG_R_ND(io, HDMI_CTRL) & BIT(0);
} /* hdmi_tx_is_controller_on */
@@ -2096,7 +2096,7 @@
static void hdmi_tx_hpd_int_work(struct work_struct *work)
{
struct hdmi_tx_ctrl *hdmi_ctrl = NULL;
- struct dss_io_data *io;
+ struct mdss_io_data *io;
int rc = -EINVAL;
int retry = MAX_EDID_READ_RETRY;
@@ -2149,7 +2149,7 @@
static int hdmi_tx_check_capability(struct hdmi_tx_ctrl *hdmi_ctrl)
{
u32 hdmi_disabled, hdcp_disabled, reg_val;
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
int ret = 0;
if (!hdmi_ctrl) {
@@ -2208,7 +2208,7 @@
static void hdmi_tx_set_mode(struct hdmi_tx_ctrl *hdmi_ctrl, u32 power_on)
{
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
/* Defaults: Disable block, HDMI mode */
u32 reg_val = BIT(1);
@@ -2260,7 +2260,7 @@
{
struct pinctrl_state *pin_state = NULL;
int rc = -EFAULT;
- struct dss_module_power *power_data = NULL;
+ struct mdss_module_power *power_data = NULL;
u64 cur_pin_states;
if (!hdmi_ctrl) {
@@ -2357,7 +2357,7 @@
enum hdmi_tx_power_module_type module, int config)
{
int rc = 0;
- struct dss_module_power *power_data = NULL;
+ struct mdss_module_power *power_data = NULL;
char name[MAX_CLIENT_NAME_LEN];
if (!hdmi_ctrl || module >= HDMI_TX_MAX_PM) {
@@ -2374,7 +2374,7 @@
}
if (config) {
- rc = msm_dss_config_vreg(&hdmi_ctrl->pdev->dev,
+ rc = msm_mdss_config_vreg(&hdmi_ctrl->pdev->dev,
power_data->vreg_config, power_data->num_vreg, 1);
if (rc) {
DEV_ERR("%s: Failed to config %s vreg. Err=%d\n",
@@ -2387,13 +2387,13 @@
mdss_reg_bus_vote_client_create(name);
if (IS_ERR(hdmi_ctrl->pdata.reg_bus_clt[module])) {
pr_err("reg bus client create failed\n");
- msm_dss_config_vreg(&hdmi_ctrl->pdev->dev,
+ msm_mdss_config_vreg(&hdmi_ctrl->pdev->dev,
power_data->vreg_config, power_data->num_vreg, 0);
rc = PTR_ERR(hdmi_ctrl->pdata.reg_bus_clt[module]);
goto exit;
}
- rc = msm_dss_get_clk(&hdmi_ctrl->pdev->dev,
+ rc = msm_mdss_get_clk(&hdmi_ctrl->pdev->dev,
power_data->clk_config, power_data->num_clk);
if (rc) {
DEV_ERR("%s: Failed to get %s clk. Err=%d\n",
@@ -2402,16 +2402,16 @@
mdss_reg_bus_vote_client_destroy(
hdmi_ctrl->pdata.reg_bus_clt[module]);
hdmi_ctrl->pdata.reg_bus_clt[module] = NULL;
- msm_dss_config_vreg(&hdmi_ctrl->pdev->dev,
+ msm_mdss_config_vreg(&hdmi_ctrl->pdev->dev,
power_data->vreg_config, power_data->num_vreg, 0);
}
} else {
- msm_dss_put_clk(power_data->clk_config, power_data->num_clk);
+ msm_mdss_put_clk(power_data->clk_config, power_data->num_clk);
mdss_reg_bus_vote_client_destroy(
hdmi_ctrl->pdata.reg_bus_clt[module]);
hdmi_ctrl->pdata.reg_bus_clt[module] = NULL;
- rc = msm_dss_config_vreg(&hdmi_ctrl->pdev->dev,
+ rc = msm_mdss_config_vreg(&hdmi_ctrl->pdev->dev,
power_data->vreg_config, power_data->num_vreg, 0);
if (rc)
DEV_ERR("%s: Fail to deconfig %s vreg. Err=%d\n",
@@ -2427,7 +2427,7 @@
{
int i;
int rc = 0;
- struct dss_module_power *pd = NULL;
+ struct mdss_module_power *pd = NULL;
if (!hdmi_ctrl || module >= HDMI_TX_MAX_PM) {
DEV_ERR("%s: Error: invalid input\n", __func__);
@@ -2473,7 +2473,7 @@
enum hdmi_tx_power_module_type module, int enable)
{
int rc = 0;
- struct dss_module_power *power_data = NULL;
+ struct mdss_module_power *power_data = NULL;
if (!hdmi_ctrl || module >= HDMI_TX_MAX_PM) {
DEV_ERR("%s: Error: invalid input\n", __func__);
@@ -2495,7 +2495,7 @@
}
if (enable && !hdmi_ctrl->power_data_enable[module]) {
- rc = msm_dss_enable_vreg(power_data->vreg_config,
+ rc = msm_mdss_enable_vreg(power_data->vreg_config,
power_data->num_vreg, 1);
if (rc) {
DEV_ERR("%s: Failed to enable %s vreg. Error=%d\n",
@@ -2510,7 +2510,7 @@
goto error;
}
- rc = msm_dss_enable_gpio(power_data->gpio_config,
+ rc = msm_mdss_enable_gpio(power_data->gpio_config,
power_data->num_gpio, 1);
if (rc) {
DEV_ERR("%s: Failed to enable %s gpio. Error=%d\n",
@@ -2520,7 +2520,7 @@
mdss_update_reg_bus_vote(hdmi_ctrl->pdata.reg_bus_clt[module],
VOTE_INDEX_LOW);
- rc = msm_dss_clk_set_rate(power_data->clk_config,
+ rc = msm_mdss_clk_set_rate(power_data->clk_config,
power_data->num_clk);
if (rc) {
DEV_ERR("%s: failed to set clks rate for %s. err=%d\n",
@@ -2528,7 +2528,7 @@
goto disable_gpio;
}
- rc = msm_dss_enable_clk(power_data->clk_config,
+ rc = msm_mdss_enable_clk(power_data->clk_config,
power_data->num_clk, 1);
if (rc) {
DEV_ERR("%s: Failed to enable clks for %s. Error=%d\n",
@@ -2539,14 +2539,14 @@
} else if (!enable && hdmi_ctrl->power_data_enable[module] &&
(!hdmi_tx_is_cec_wakeup_en(hdmi_ctrl) ||
((module != HDMI_TX_HPD_PM) && (module != HDMI_TX_CEC_PM)))) {
- msm_dss_enable_clk(power_data->clk_config,
+ msm_mdss_enable_clk(power_data->clk_config,
power_data->num_clk, 0);
mdss_update_reg_bus_vote(hdmi_ctrl->pdata.reg_bus_clt[module],
VOTE_INDEX_DISABLE);
- msm_dss_enable_gpio(power_data->gpio_config,
+ msm_mdss_enable_gpio(power_data->gpio_config,
power_data->num_gpio, 0);
hdmi_tx_pinctrl_set_state(hdmi_ctrl, module, 0);
- msm_dss_enable_vreg(power_data->vreg_config,
+ msm_mdss_enable_vreg(power_data->vreg_config,
power_data->num_vreg, 0);
hdmi_ctrl->power_data_enable[module] = false;
}
@@ -2556,9 +2556,9 @@
disable_gpio:
mdss_update_reg_bus_vote(hdmi_ctrl->pdata.reg_bus_clt[module],
VOTE_INDEX_DISABLE);
- msm_dss_enable_gpio(power_data->gpio_config, power_data->num_gpio, 0);
+ msm_mdss_enable_gpio(power_data->gpio_config, power_data->num_gpio, 0);
disable_vreg:
- msm_dss_enable_vreg(power_data->vreg_config, power_data->num_vreg, 0);
+ msm_mdss_enable_vreg(power_data->vreg_config, power_data->num_vreg, 0);
error:
return rc;
} /* hdmi_tx_enable_power */
@@ -2607,7 +2607,7 @@
unsigned int phy_reset_polarity = 0x0;
unsigned int pll_reset_polarity = 0x0;
unsigned int val;
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
if (!hdmi_ctrl) {
DEV_ERR("%s: invalid input\n", __func__);
@@ -2865,7 +2865,7 @@
static void hdmi_tx_hpd_polarity_setup(struct hdmi_tx_ctrl *hdmi_ctrl,
bool polarity)
{
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
bool cable_sense;
if (!hdmi_ctrl) {
@@ -2913,7 +2913,7 @@
static int hdmi_tx_power_off(struct hdmi_tx_ctrl *hdmi_ctrl)
{
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
void *pdata = NULL;
if (!hdmi_ctrl) {
@@ -3041,7 +3041,7 @@
static void hdmi_tx_hpd_off(struct hdmi_tx_ctrl *hdmi_ctrl)
{
int rc = 0;
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
unsigned long flags;
if (!hdmi_ctrl) {
@@ -3091,7 +3091,7 @@
{
u32 reg_val;
int rc = 0;
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
if (!hdmi_ctrl) {
DEV_ERR("%s: invalid input\n", __func__);
@@ -3114,7 +3114,7 @@
return rc;
}
- dss_reg_dump(io->base, io->len, "HDMI-INIT: ", REG_DUMP);
+ mdss_reg_dump(io->base, io->len, "HDMI-INIT: ", REG_DUMP);
if (!hdmi_ctrl->panel_data.panel_info.cont_splash_enabled) {
hdmi_tx_set_mode(hdmi_ctrl, false);
@@ -3213,7 +3213,7 @@
static irqreturn_t hdmi_tx_isr(int irq, void *data)
{
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
struct hdmi_tx_ctrl *hdmi_ctrl = (struct hdmi_tx_ctrl *)data;
unsigned long flags;
u32 hpd_current_state;
@@ -3854,7 +3854,7 @@
/* IO */
for (i = HDMI_TX_MAX_IO - 1; i >= 0; i--) {
if (hdmi_ctrl->pdata.io[i].base)
- msm_dss_iounmap(&hdmi_ctrl->pdata.io[i]);
+ msm_mdss_iounmap(&hdmi_ctrl->pdata.io[i]);
}
} /* hdmi_tx_deinit_resource */
@@ -3874,7 +3874,7 @@
/* IO */
for (i = 0; i < HDMI_TX_MAX_IO; i++) {
- rc = msm_dss_ioremap_byname(hdmi_ctrl->pdev, &pdata->io[i],
+ rc = msm_mdss_ioremap_byname(hdmi_ctrl->pdev, &pdata->io[i],
hdmi_tx_io_name(i));
if (rc) {
DEV_DBG("%s: '%s' remap failed or not available\n",
@@ -3903,7 +3903,7 @@
} /* hdmi_tx_init_resource */
static void hdmi_tx_put_dt_clk_data(struct device *dev,
- struct dss_module_power *module_power)
+ struct mdss_module_power *module_power)
{
if (!module_power) {
DEV_ERR("%s: invalid input\n", __func__);
@@ -3919,7 +3919,7 @@
/* todo: once clk are moved to device tree then change this implementation */
static int hdmi_tx_get_dt_clk_data(struct device *dev,
- struct dss_module_power *mp, u32 module_type)
+ struct mdss_module_power *mp, u32 module_type)
{
int rc = 0;
@@ -3933,7 +3933,7 @@
switch (module_type) {
case HDMI_TX_HPD_PM:
mp->num_clk = 4;
- mp->clk_config = devm_kzalloc(dev, sizeof(struct dss_clk) *
+ mp->clk_config = devm_kzalloc(dev, sizeof(struct mdss_clk) *
mp->num_clk, GFP_KERNEL);
if (!mp->clk_config) {
DEV_ERR("%s: can't alloc '%s' clk mem\n", __func__,
@@ -3966,7 +3966,7 @@
case HDMI_TX_CORE_PM:
mp->num_clk = 1;
- mp->clk_config = devm_kzalloc(dev, sizeof(struct dss_clk) *
+ mp->clk_config = devm_kzalloc(dev, sizeof(struct mdss_clk) *
mp->num_clk, GFP_KERNEL);
if (!mp->clk_config) {
DEV_ERR("%s: can't alloc '%s' clk mem\n", __func__,
@@ -4005,7 +4005,7 @@
} /* hdmi_tx_get_dt_clk_data */
static void hdmi_tx_put_dt_vreg_data(struct device *dev,
- struct dss_module_power *module_power)
+ struct mdss_module_power *module_power)
{
if (!module_power) {
DEV_ERR("%s: invalid input\n", __func__);
@@ -4020,7 +4020,7 @@
} /* hdmi_tx_put_dt_vreg_data */
static int hdmi_tx_get_dt_vreg_data(struct device *dev,
- struct dss_module_power *mp, u32 module_type)
+ struct mdss_module_power *mp, u32 module_type)
{
int i, j, rc = 0;
int dt_vreg_total = 0, mod_vreg_total = 0;
@@ -4085,7 +4085,7 @@
if (mod_vreg_total > 0) {
mp->num_vreg = mod_vreg_total;
- mp->vreg_config = devm_kzalloc(dev, sizeof(struct dss_vreg) *
+ mp->vreg_config = devm_kzalloc(dev, sizeof(struct mdss_vreg) *
mod_vreg_total, GFP_KERNEL);
if (!mp->vreg_config) {
DEV_ERR("%s: can't alloc '%s' vreg mem\n", __func__,
@@ -4198,7 +4198,7 @@
} /* hdmi_tx_get_dt_vreg_data */
static void hdmi_tx_put_dt_gpio_data(struct device *dev,
- struct dss_module_power *module_power)
+ struct mdss_module_power *module_power)
{
if (!module_power) {
DEV_ERR("%s: invalid input\n", __func__);
@@ -4213,11 +4213,11 @@
} /* hdmi_tx_put_dt_gpio_data */
static int hdmi_tx_get_dt_gpio_data(struct device *dev,
- struct dss_module_power *mp, u32 module_type)
+ struct mdss_module_power *mp, u32 module_type)
{
int i, j;
int mp_gpio_cnt = 0, gpio_list_size = 0;
- struct dss_gpio *gpio_list = NULL;
+ struct mdss_gpio *gpio_list = NULL;
struct device_node *of_node = NULL;
DEV_DBG("%s: module: '%s'\n", __func__, hdmi_tx_pm_name(module_type));
@@ -4264,7 +4264,7 @@
DEV_DBG("%s: mp_gpio_cnt = %d\n", __func__, mp_gpio_cnt);
mp->num_gpio = mp_gpio_cnt;
- mp->gpio_config = devm_kzalloc(dev, sizeof(struct dss_gpio) *
+ mp->gpio_config = devm_kzalloc(dev, sizeof(struct mdss_gpio) *
mp_gpio_cnt, GFP_KERNEL);
if (!mp->gpio_config) {
DEV_ERR("%s: can't alloc '%s' gpio mem\n", __func__,
@@ -4283,7 +4283,7 @@
continue;
}
memcpy(&mp->gpio_config[j], &gpio_list[i],
- sizeof(struct dss_gpio));
+ sizeof(struct mdss_gpio));
mp->gpio_config[j].gpio = (unsigned int)gpio;
@@ -4531,17 +4531,17 @@
if (hdmi_ctrl->panel_data.panel_info.cont_splash_enabled) {
for (i = 0; i < HDMI_TX_MAX_PM; i++) {
- msm_dss_enable_vreg(
+ msm_mdss_enable_vreg(
hdmi_ctrl->pdata.power_data[i].vreg_config,
hdmi_ctrl->pdata.power_data[i].num_vreg, 1);
hdmi_tx_pinctrl_set_state(hdmi_ctrl, i, 1);
- msm_dss_enable_gpio(
+ msm_mdss_enable_gpio(
hdmi_ctrl->pdata.power_data[i].gpio_config,
hdmi_ctrl->pdata.power_data[i].num_gpio, 1);
- msm_dss_enable_clk(
+ msm_mdss_enable_clk(
hdmi_ctrl->pdata.power_data[i].clk_config,
hdmi_ctrl->pdata.power_data[i].num_clk, 1);
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.h b/drivers/video/fbdev/msm/mdss_hdmi_tx.h
index d09ca3c..6a13c75 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_tx.h
+++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.h
@@ -41,8 +41,8 @@
bool primary;
bool cont_splash_enabled;
bool cond_power_on;
- struct dss_io_data io[HDMI_TX_MAX_IO];
- struct dss_module_power power_data[HDMI_TX_MAX_PM];
+ struct mdss_io_data io[HDMI_TX_MAX_IO];
+ struct mdss_module_power power_data[HDMI_TX_MAX_PM];
struct reg_bus_client *reg_bus_clt[HDMI_TX_MAX_PM];
/* bitfield representing each module's pin state */
u64 pin_states;
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_util.c b/drivers/video/fbdev/msm/mdss_hdmi_util.c
index 0753b89..b5bedfa 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_util.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_util.c
@@ -186,7 +186,7 @@
{
u32 reg_val;
int rc;
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
if (!ctrl || !ctrl->io) {
pr_err("invalid input\n");
@@ -655,7 +655,7 @@
enum trigger_mode mode, bool seg)
{
struct hdmi_tx_ddc_data *ddc_data = &ddc_ctrl->ddc_data;
- struct dss_io_data *io = ddc_ctrl->io;
+ struct mdss_io_data *io = ddc_ctrl->io;
u32 const seg_addr = 0x60, seg_num = 0x01;
u32 ddc_ctrl_reg_val;
@@ -886,7 +886,7 @@
static int hdmi_ddc_hdcp2p2_isr(struct hdmi_tx_ddc_ctrl *ddc_ctrl)
{
- struct dss_io_data *io = NULL;
+ struct mdss_io_data *io = NULL;
struct hdmi_tx_hdcp2p2_ddc_data *data;
u32 intr0, intr2, intr5;
u32 msg_size;
@@ -1022,7 +1022,7 @@
static int hdmi_ddc_scrambling_isr(struct hdmi_tx_ddc_ctrl *ddc_ctrl)
{
- struct dss_io_data *io;
+ struct mdss_io_data *io;
bool scrambler_timer_off = false;
u32 intr2, intr5;
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_util.h b/drivers/video/fbdev/msm/mdss_hdmi_util.h
index d26be99..ecab9d5 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_util.h
+++ b/drivers/video/fbdev/msm/mdss_hdmi_util.h
@@ -447,7 +447,7 @@
atomic_t write_busy_wait_done;
atomic_t read_busy_wait_done;
atomic_t rxstatus_busy_wait_done;
- struct dss_io_data *io;
+ struct mdss_io_data *io;
struct completion ddc_sw_done;
struct hdmi_tx_ddc_data ddc_data;
struct hdmi_tx_hdcp2p2_ddc_data hdcp2p2_ddc_data;
diff --git a/drivers/video/fbdev/msm/mdss_io_util.c b/drivers/video/fbdev/msm/mdss_io_util.c
index 414c075..3117793 100644
--- a/drivers/video/fbdev/msm/mdss_io_util.c
+++ b/drivers/video/fbdev/msm/mdss_io_util.c
@@ -17,7 +17,7 @@
#include <linux/mdss_io_util.h>
#define MAX_I2C_CMDS 16
-void dss_reg_w(struct dss_io_data *io, u32 offset, u32 value, u32 debug)
+void mdss_reg_w(struct mdss_io_data *io, u32 offset, u32 value, u32 debug)
{
u32 in_val;
@@ -41,10 +41,10 @@
value, in_val);
}
-} /* dss_reg_w */
-EXPORT_SYMBOL(dss_reg_w);
+} /* mdss_reg_w */
+EXPORT_SYMBOL(mdss_reg_w);
-u32 dss_reg_r(struct dss_io_data *io, u32 offset, u32 debug)
+u32 mdss_reg_r(struct mdss_io_data *io, u32 offset, u32 debug)
{
u32 value;
@@ -66,19 +66,19 @@
(u32)(unsigned long)(io->base + offset), value);
return value;
-} /* dss_reg_r */
-EXPORT_SYMBOL(dss_reg_r);
+} /* mdss_reg_r */
+EXPORT_SYMBOL(mdss_reg_r);
-void dss_reg_dump(void __iomem *base, u32 length, const char *prefix,
+void mdss_reg_dump(void __iomem *base, u32 length, const char *prefix,
u32 debug)
{
if (debug)
print_hex_dump(KERN_INFO, prefix, DUMP_PREFIX_OFFSET, 32, 4,
(void *)base, length, false);
-} /* dss_reg_dump */
-EXPORT_SYMBOL(dss_reg_dump);
+} /* mdss_reg_dump */
+EXPORT_SYMBOL(mdss_reg_dump);
-static struct resource *msm_dss_get_res_byname(struct platform_device *pdev,
+static struct resource *msm_mdss_get_res_byname(struct platform_device *pdev,
unsigned int type, const char *name)
{
struct resource *res = NULL;
@@ -88,11 +88,11 @@
DEV_ERR("%s: '%s' resource not found\n", __func__, name);
return res;
-} /* msm_dss_get_res_byname */
-EXPORT_SYMBOL(msm_dss_get_res_byname);
+} /* msm_mdss_get_res_byname */
+EXPORT_SYMBOL(msm_mdss_get_res_byname);
-int msm_dss_ioremap_byname(struct platform_device *pdev,
- struct dss_io_data *io_data, const char *name)
+int msm_mdss_ioremap_byname(struct platform_device *pdev,
+ struct mdss_io_data *io_data, const char *name)
{
struct resource *res = NULL;
@@ -102,9 +102,9 @@
return -EINVAL;
}
- res = msm_dss_get_res_byname(pdev, IORESOURCE_MEM, name);
+ res = msm_mdss_get_res_byname(pdev, IORESOURCE_MEM, name);
if (!res) {
- DEV_ERR("%pS->%s: '%s' msm_dss_get_res_byname failed\n",
+ DEV_ERR("%pS->%s: '%s' msm_mdss_get_res_byname failed\n",
__builtin_return_address(0), __func__, name);
return -ENODEV;
}
@@ -118,10 +118,10 @@
}
return 0;
-} /* msm_dss_ioremap_byname */
-EXPORT_SYMBOL(msm_dss_ioremap_byname);
+} /* msm_mdss_ioremap_byname */
+EXPORT_SYMBOL(msm_mdss_ioremap_byname);
-void msm_dss_iounmap(struct dss_io_data *io_data)
+void msm_mdss_iounmap(struct mdss_io_data *io_data)
{
if (!io_data) {
DEV_ERR("%pS->%s: invalid input\n",
@@ -134,15 +134,15 @@
io_data->base = NULL;
}
io_data->len = 0;
-} /* msm_dss_iounmap */
-EXPORT_SYMBOL(msm_dss_iounmap);
+} /* msm_mdss_iounmap */
+EXPORT_SYMBOL(msm_mdss_iounmap);
-int msm_dss_config_vreg(struct device *dev, struct dss_vreg *in_vreg,
+int msm_mdss_config_vreg(struct device *dev, struct mdss_vreg *in_vreg,
int num_vreg, int config)
{
int i = 0, rc = 0;
- struct dss_vreg *curr_vreg = NULL;
- enum dss_vreg_type type;
+ struct mdss_vreg *curr_vreg = NULL;
+ enum mdss_vreg_type type;
if (!in_vreg || !num_vreg)
return rc;
@@ -210,11 +210,11 @@
goto vreg_unconfig;
}
return rc;
-} /* msm_dss_config_vreg */
-EXPORT_SYMBOL(msm_dss_config_vreg);
+} /* msm_mdss_config_vreg */
+EXPORT_SYMBOL(msm_mdss_config_vreg);
-int msm_dss_config_vreg_opt_mode(struct dss_vreg *in_vreg, int num_vreg,
- enum dss_vreg_mode mode)
+int msm_mdss_config_vreg_opt_mode(struct mdss_vreg *in_vreg, int num_vreg,
+ enum mdss_vreg_mode mode)
{
int i = 0, rc = 0;
@@ -257,9 +257,9 @@
error:
return rc;
}
-EXPORT_SYMBOL(msm_dss_config_vreg_opt_mode);
+EXPORT_SYMBOL(msm_mdss_config_vreg_opt_mode);
-int msm_dss_enable_vreg(struct dss_vreg *in_vreg, int num_vreg, int enable)
+int msm_mdss_enable_vreg(struct mdss_vreg *in_vreg, int num_vreg, int enable)
{
int i = 0, rc = 0;
bool need_sleep;
@@ -332,10 +332,10 @@
}
return rc;
-} /* msm_dss_enable_vreg */
-EXPORT_SYMBOL(msm_dss_enable_vreg);
+} /* msm_mdss_enable_vreg */
+EXPORT_SYMBOL(msm_mdss_enable_vreg);
-int msm_dss_enable_gpio(struct dss_gpio *in_gpio, int num_gpio, int enable)
+int msm_mdss_enable_gpio(struct mdss_gpio *in_gpio, int num_gpio, int enable)
{
int i = 0, rc = 0;
@@ -372,10 +372,10 @@
gpio_free(in_gpio[i].gpio);
return rc;
-} /* msm_dss_enable_gpio */
-EXPORT_SYMBOL(msm_dss_enable_gpio);
+} /* msm_mdss_enable_gpio */
+EXPORT_SYMBOL(msm_mdss_enable_gpio);
-void msm_dss_put_clk(struct dss_clk *clk_arry, int num_clk)
+void msm_mdss_put_clk(struct mdss_clk *clk_arry, int num_clk)
{
int i;
@@ -384,10 +384,10 @@
clk_put(clk_arry[i].clk);
clk_arry[i].clk = NULL;
}
-} /* msm_dss_put_clk */
-EXPORT_SYMBOL(msm_dss_put_clk);
+} /* msm_mdss_put_clk */
+EXPORT_SYMBOL(msm_mdss_put_clk);
-int msm_dss_get_clk(struct device *dev, struct dss_clk *clk_arry, int num_clk)
+int msm_mdss_get_clk(struct device *dev, struct mdss_clk *clk_arry, int num_clk)
{
int i, rc = 0;
@@ -405,13 +405,13 @@
return rc;
error:
- msm_dss_put_clk(clk_arry, num_clk);
+ msm_mdss_put_clk(clk_arry, num_clk);
return rc;
-} /* msm_dss_get_clk */
-EXPORT_SYMBOL(msm_dss_get_clk);
+} /* msm_mdss_get_clk */
+EXPORT_SYMBOL(msm_mdss_get_clk);
-int msm_dss_clk_set_rate(struct dss_clk *clk_arry, int num_clk)
+int msm_mdss_clk_set_rate(struct mdss_clk *clk_arry, int num_clk)
{
int i, rc = 0;
@@ -442,10 +442,10 @@
}
return rc;
-} /* msm_dss_clk_set_rate */
-EXPORT_SYMBOL(msm_dss_clk_set_rate);
+} /* msm_mdss_clk_set_rate */
+EXPORT_SYMBOL(msm_mdss_clk_set_rate);
-int msm_dss_enable_clk(struct dss_clk *clk_arry, int num_clk, int enable)
+int msm_mdss_enable_clk(struct mdss_clk *clk_arry, int num_clk, int enable)
{
int i, rc = 0;
@@ -469,7 +469,7 @@
}
if (rc) {
- msm_dss_enable_clk(&clk_arry[i],
+ msm_mdss_enable_clk(&clk_arry[i],
i, false);
break;
}
@@ -490,8 +490,8 @@
}
return rc;
-} /* msm_dss_enable_clk */
-EXPORT_SYMBOL(msm_dss_enable_clk);
+} /* msm_mdss_enable_clk */
+EXPORT_SYMBOL(msm_mdss_enable_clk);
int mdss_i2c_byte_read(struct i2c_client *client, uint8_t slave_addr,
diff --git a/drivers/video/fbdev/msm/mdss_mdp.c b/drivers/video/fbdev/msm/mdss_mdp.c
index 8c8d28e..a9a5d8f 100644
--- a/drivers/video/fbdev/msm/mdss_mdp.c
+++ b/drivers/video/fbdev/msm/mdss_mdp.c
@@ -2630,7 +2630,7 @@
mdss_res->mdss_util->panel_intf_type = mdss_panel_intf_type;
mdss_res->mdss_util->panel_intf_status = mdss_panel_get_intf_status;
- rc = msm_dss_ioremap_byname(pdev, &mdata->mdss_io, "mdp_phys");
+ rc = msm_mdss_ioremap_byname(pdev, &mdata->mdss_io, "mdp_phys");
if (rc) {
pr_err("unable to map MDP base\n");
goto probe_done;
@@ -2639,7 +2639,7 @@
(int) (unsigned long) mdata->mdss_io.base,
mdata->mdss_io.len);
- rc = msm_dss_ioremap_byname(pdev, &mdata->vbif_io, "vbif_phys");
+ rc = msm_mdss_ioremap_byname(pdev, &mdata->vbif_io, "vbif_phys");
if (rc) {
pr_err("unable to map MDSS VBIF base\n");
goto probe_done;
@@ -2648,7 +2648,8 @@
(int) (unsigned long) mdata->vbif_io.base,
mdata->vbif_io.len);
- rc = msm_dss_ioremap_byname(pdev, &mdata->vbif_nrt_io, "vbif_nrt_phys");
+ rc = msm_mdss_ioremap_byname(pdev, &mdata->vbif_nrt_io,
+ "vbif_nrt_phys");
if (rc)
pr_debug("unable to map MDSS VBIF non-realtime base\n");
else
@@ -2844,8 +2845,8 @@
return rc;
}
-static void mdss_mdp_parse_dt_regs_array(const u32 *arr, struct dss_io_data *io,
- struct mdss_hw_settings *hws, int count)
+static void mdss_mdp_parse_dt_regs_array(const u32 *arr,
+ struct mdss_io_data *io, struct mdss_hw_settings *hws, int count)
{
u32 len, reg;
int i;
diff --git a/drivers/video/fbdev/msm/mdss_rotator.c b/drivers/video/fbdev/msm/mdss_rotator.c
index ff4dbb7..23ba190 100644
--- a/drivers/video/fbdev/msm/mdss_rotator.c
+++ b/drivers/video/fbdev/msm/mdss_rotator.c
@@ -253,7 +253,7 @@
}
pr_debug("%s: rotator regulators", on ? "Enable" : "Disable");
- ret = msm_dss_enable_vreg(mgr->module_power.vreg_config,
+ ret = msm_mdss_enable_vreg(mgr->module_power.vreg_config,
mgr->module_power.num_vreg, on);
if (ret) {
pr_warn("Rotator regulator failed to %s\n",
@@ -2677,14 +2677,14 @@
}
static void mdss_rotator_put_dt_vreg_data(struct device *dev,
- struct dss_module_power *mp)
+ struct mdss_module_power *mp)
{
if (!mp) {
DEV_ERR("%s: invalid input\n", __func__);
return;
}
- msm_dss_config_vreg(dev, mp->vreg_config, mp->num_vreg, 0);
+ msm_mdss_config_vreg(dev, mp->vreg_config, mp->num_vreg, 0);
if (mp->vreg_config) {
devm_kfree(dev, mp->vreg_config);
mp->vreg_config = NULL;
@@ -2693,7 +2693,7 @@
}
static int mdss_rotator_get_dt_vreg_data(struct device *dev,
- struct dss_module_power *mp)
+ struct mdss_module_power *mp)
{
const char *st = NULL;
struct device_node *of_node = NULL;
@@ -2715,7 +2715,7 @@
return 0;
}
mp->num_vreg = dt_vreg_total;
- mp->vreg_config = devm_kzalloc(dev, sizeof(struct dss_vreg) *
+ mp->vreg_config = devm_kzalloc(dev, sizeof(struct mdss_vreg) *
dt_vreg_total, GFP_KERNEL);
if (!mp->vreg_config) {
DEV_ERR("%s: can't alloc vreg mem\n", __func__);
@@ -2733,7 +2733,7 @@
}
snprintf(mp->vreg_config[i].vreg_name, 32, "%s", st);
}
- msm_dss_config_vreg(dev, mp->vreg_config, mp->num_vreg, 1);
+ msm_mdss_config_vreg(dev, mp->vreg_config, mp->num_vreg, 1);
for (i = 0; i < dt_vreg_total; i++) {
DEV_DBG("%s: %s min=%d, max=%d, enable=%d disable=%d\n",
diff --git a/drivers/video/fbdev/msm/mdss_rotator_internal.h b/drivers/video/fbdev/msm/mdss_rotator_internal.h
index 8dd400e..751140d 100644
--- a/drivers/video/fbdev/msm/mdss_rotator_internal.h
+++ b/drivers/video/fbdev/msm/mdss_rotator_internal.h
@@ -174,7 +174,7 @@
struct mdss_rot_bus_data_type reg_bus;
/* Module power is only used for regulator management */
- struct dss_module_power module_power;
+ struct mdss_module_power module_power;
bool regulator_enable;
struct mutex clk_lock;
diff --git a/drivers/video/fbdev/msm/mdss_smmu.c b/drivers/video/fbdev/msm/mdss_smmu.c
index 699aacc..7a44824 100644
--- a/drivers/video/fbdev/msm/mdss_smmu.c
+++ b/drivers/video/fbdev/msm/mdss_smmu.c
@@ -70,7 +70,7 @@
}
static int mdss_smmu_util_parse_dt_clock(struct platform_device *pdev,
- struct dss_module_power *mp)
+ struct mdss_module_power *mp)
{
u32 i = 0, rc = 0;
const char *clock_name;
@@ -86,7 +86,7 @@
mp->num_clk = num_clk;
mp->clk_config = devm_kzalloc(&pdev->dev,
- sizeof(struct dss_clk) * mp->num_clk, GFP_KERNEL);
+ sizeof(struct mdss_clk) * mp->num_clk, GFP_KERNEL);
if (!mp->clk_config) {
rc = -ENOMEM;
mp->num_clk = 0;
@@ -114,7 +114,7 @@
}
static int mdss_smmu_clk_register(struct platform_device *pdev,
- struct dss_module_power *mp)
+ struct mdss_module_power *mp)
{
int i, ret;
struct clk *clk;
@@ -142,7 +142,7 @@
bool enable)
{
int rc = 0;
- struct dss_module_power *mp;
+ struct mdss_module_power *mp;
if (!mdss_smmu)
return -EINVAL;
@@ -153,27 +153,27 @@
return 0;
if (enable) {
- rc = msm_dss_enable_vreg(mp->vreg_config, mp->num_vreg, true);
+ rc = msm_mdss_enable_vreg(mp->vreg_config, mp->num_vreg, true);
if (rc) {
pr_err("vreg enable failed - rc:%d\n", rc);
goto end;
}
mdss_update_reg_bus_vote(mdss_smmu->reg_bus_clt,
VOTE_INDEX_LOW);
- rc = msm_dss_enable_clk(mp->clk_config, mp->num_clk, true);
+ rc = msm_mdss_enable_clk(mp->clk_config, mp->num_clk, true);
if (rc) {
pr_err("clock enable failed - rc:%d\n", rc);
mdss_update_reg_bus_vote(mdss_smmu->reg_bus_clt,
VOTE_INDEX_DISABLE);
- msm_dss_enable_vreg(mp->vreg_config, mp->num_vreg,
+ msm_mdss_enable_vreg(mp->vreg_config, mp->num_vreg,
false);
goto end;
}
} else {
- msm_dss_enable_clk(mp->clk_config, mp->num_clk, false);
+ msm_mdss_enable_clk(mp->clk_config, mp->num_clk, false);
mdss_update_reg_bus_vote(mdss_smmu->reg_bus_clt,
VOTE_INDEX_DISABLE);
- msm_dss_enable_vreg(mp->vreg_config, mp->num_vreg, false);
+ msm_mdss_enable_vreg(mp->vreg_config, mp->num_vreg, false);
}
end:
return rc;
@@ -726,7 +726,7 @@
int rc = 0;
struct mdss_smmu_domain smmu_domain;
const struct of_device_id *match;
- struct dss_module_power *mp;
+ struct mdss_module_power *mp;
char name[MAX_CLIENT_NAME_LEN];
const __be32 *address = NULL, *size = NULL;
@@ -764,13 +764,13 @@
mdss_smmu = &mdata->mdss_smmu[smmu_domain.domain];
mp = &mdss_smmu->mp;
- memset(mp, 0, sizeof(struct dss_module_power));
+ memset(mp, 0, sizeof(struct mdss_module_power));
if (of_find_property(pdev->dev.of_node,
"gdsc-mmagic-mdss-supply", NULL)) {
mp->vreg_config = devm_kzalloc(&pdev->dev,
- sizeof(struct dss_vreg), GFP_KERNEL);
+ sizeof(struct mdss_vreg), GFP_KERNEL);
if (!mp->vreg_config)
return -ENOMEM;
@@ -779,7 +779,7 @@
mp->num_vreg = 1;
}
- rc = msm_dss_config_vreg(&pdev->dev, mp->vreg_config,
+ rc = msm_mdss_config_vreg(&pdev->dev, mp->vreg_config,
mp->num_vreg, true);
if (rc) {
pr_err("vreg config failed rc=%d\n", rc);
@@ -790,7 +790,7 @@
if (rc) {
pr_err("smmu clk register failed for domain[%d] with err:%d\n",
smmu_domain.domain, rc);
- msm_dss_config_vreg(&pdev->dev, mp->vreg_config, mp->num_vreg,
+ msm_mdss_config_vreg(&pdev->dev, mp->vreg_config, mp->num_vreg,
false);
return rc;
}
@@ -799,7 +799,7 @@
mdss_smmu->reg_bus_clt = mdss_reg_bus_vote_client_create(name);
if (IS_ERR(mdss_smmu->reg_bus_clt)) {
pr_err("mdss bus client register failed\n");
- msm_dss_config_vreg(&pdev->dev, mp->vreg_config, mp->num_vreg,
+ msm_mdss_config_vreg(&pdev->dev, mp->vreg_config, mp->num_vreg,
false);
return PTR_ERR(mdss_smmu->reg_bus_clt);
}
@@ -862,7 +862,7 @@
bus_client_destroy:
mdss_reg_bus_vote_client_destroy(mdss_smmu->reg_bus_clt);
mdss_smmu->reg_bus_clt = NULL;
- msm_dss_config_vreg(&pdev->dev, mp->vreg_config, mp->num_vreg,
+ msm_mdss_config_vreg(&pdev->dev, mp->vreg_config, mp->num_vreg,
false);
return rc;
}
diff --git a/drivers/video/fbdev/msm/mhl_sii8334.c b/drivers/video/fbdev/msm/mhl_sii8334.c
index 5d0ac99..cf45eb6 100644
--- a/drivers/video/fbdev/msm/mhl_sii8334.c
+++ b/drivers/video/fbdev/msm/mhl_sii8334.c
@@ -240,7 +240,7 @@
{
int i, rc = 0;
struct device_node *of_node = NULL;
- struct dss_gpio *temp_gpio = NULL;
+ struct mdss_gpio *temp_gpio = NULL;
struct platform_device *hdmi_pdev = NULL;
struct device_node *hdmi_tx_node = NULL;
int dt_gpio;
@@ -262,7 +262,7 @@
/* GPIOs */
temp_gpio = NULL;
- temp_gpio = devm_kzalloc(dev, sizeof(struct dss_gpio), GFP_KERNEL);
+ temp_gpio = devm_kzalloc(dev, sizeof(struct mdss_gpio), GFP_KERNEL);
pr_debug("%s: gpios allocd\n", __func__);
if (!(temp_gpio)) {
pr_err("%s: can't alloc %d gpio mem\n", __func__, i);
@@ -283,7 +283,7 @@
/* PWR */
temp_gpio = NULL;
- temp_gpio = devm_kzalloc(dev, sizeof(struct dss_gpio), GFP_KERNEL);
+ temp_gpio = devm_kzalloc(dev, sizeof(struct mdss_gpio), GFP_KERNEL);
pr_debug("%s: gpios allocd\n", __func__);
if (!(temp_gpio)) {
pr_err("%s: can't alloc %d gpio mem\n", __func__, i);
@@ -303,7 +303,7 @@
/* INTR */
temp_gpio = NULL;
- temp_gpio = devm_kzalloc(dev, sizeof(struct dss_gpio), GFP_KERNEL);
+ temp_gpio = devm_kzalloc(dev, sizeof(struct mdss_gpio), GFP_KERNEL);
pr_debug("%s: gpios allocd\n", __func__);
if (!(temp_gpio)) {
pr_err("%s: can't alloc %d gpio mem\n", __func__, i);
@@ -1716,7 +1716,7 @@
static int mhl_gpio_config(struct mhl_tx_ctrl *mhl_ctrl, int on)
{
int ret;
- struct dss_gpio *temp_reset_gpio, *temp_intr_gpio;
+ struct mdss_gpio *temp_reset_gpio, *temp_intr_gpio;
/* caused too many line spills */
temp_reset_gpio = mhl_ctrl->pdata->gpios[MHL_TX_RESET_GPIO];
diff --git a/drivers/video/fbdev/msm/msm_dba/adv7533.c b/drivers/video/fbdev/msm/msm_dba/adv7533.c
index b628e1a..5b44a49 100644
--- a/drivers/video/fbdev/msm/msm_dba/adv7533.c
+++ b/drivers/video/fbdev/msm/msm_dba/adv7533.c
@@ -125,7 +125,7 @@
struct pinctrl_state *pinctrl_state_suspend;
bool audio;
bool disable_gpios;
- struct dss_module_power power_data;
+ struct mdss_module_power power_data;
bool hdcp_enabled;
bool cec_enabled;
bool is_power_on;
@@ -433,7 +433,7 @@
}
static void adv7533_parse_vreg_dt(struct device *dev,
- struct dss_module_power *mp)
+ struct mdss_module_power *mp)
{
int i, rc = 0;
int dt_vreg_total = 0;
@@ -449,7 +449,7 @@
goto end;
}
mp->num_vreg = dt_vreg_total;
- mp->vreg_config = devm_kzalloc(dev, sizeof(struct dss_vreg) *
+ mp->vreg_config = devm_kzalloc(dev, sizeof(struct mdss_vreg) *
dt_vreg_total, GFP_KERNEL);
if (!mp->vreg_config)
goto end;
@@ -1471,7 +1471,7 @@
static int adv7533_config_vreg(struct adv7533 *pdata, int enable)
{
int rc = 0;
- struct dss_module_power *power_data = NULL;
+ struct mdss_module_power *power_data = NULL;
if (!pdata) {
pr_err("invalid input\n");
@@ -1486,7 +1486,7 @@
}
if (enable) {
- rc = msm_dss_config_vreg(&pdata->i2c_client->dev,
+ rc = msm_mdss_config_vreg(&pdata->i2c_client->dev,
power_data->vreg_config,
power_data->num_vreg, 1);
if (rc) {
@@ -1495,7 +1495,7 @@
goto exit;
}
} else {
- rc = msm_dss_config_vreg(&pdata->i2c_client->dev,
+ rc = msm_mdss_config_vreg(&pdata->i2c_client->dev,
power_data->vreg_config,
power_data->num_vreg, 0);
if (rc) {
@@ -1512,7 +1512,7 @@
static int adv7533_enable_vreg(struct adv7533 *pdata, int enable)
{
int rc = 0;
- struct dss_module_power *power_data = NULL;
+ struct mdss_module_power *power_data = NULL;
if (!pdata) {
pr_err("invalid input\n");
@@ -1527,7 +1527,7 @@
}
if (enable) {
- rc = msm_dss_enable_vreg(power_data->vreg_config,
+ rc = msm_mdss_enable_vreg(power_data->vreg_config,
power_data->num_vreg, 1);
if (rc) {
pr_err("%s: Failed to enable vreg. Err=%d\n",
@@ -1535,7 +1535,7 @@
goto exit;
}
} else {
- rc = msm_dss_enable_vreg(power_data->vreg_config,
+ rc = msm_mdss_enable_vreg(power_data->vreg_config,
power_data->num_vreg, 0);
if (rc) {
pr_err("%s: Failed to disable vreg. Err=%d\n",
diff --git a/drivers/video/fbdev/msm/msm_mdss_io_8974.c b/drivers/video/fbdev/msm/msm_mdss_io_8974.c
index 05a7fc0..39d26a4 100644
--- a/drivers/video/fbdev/msm/msm_mdss_io_8974.c
+++ b/drivers/video/fbdev/msm/msm_mdss_io_8974.c
@@ -2314,7 +2314,7 @@
if ((ctrl->ctrl_state & CTRL_STATE_DSI_ACTIVE) &&
(i != DSI_CORE_PM))
continue;
- rc = msm_dss_enable_vreg(
+ rc = msm_mdss_enable_vreg(
sdata->power_data[i].vreg_config,
sdata->power_data[i].num_vreg, 0);
if (rc) {
@@ -2374,7 +2374,7 @@
(!pdata->panel_info.cont_splash_enabled) &&
(i != DSI_CORE_PM))
continue;
- rc = msm_dss_enable_vreg(
+ rc = msm_mdss_enable_vreg(
sdata->power_data[i].vreg_config,
sdata->power_data[i].num_vreg, 1);
if (rc) {