diff options
| author | Jayant Shekhar <jshekhar@codeaurora.org> | 2013-12-09 19:01:32 +0530 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:24:12 -0700 |
| commit | 63d3936e49841894499b5f0fcbdb55f5f2e383da (patch) | |
| tree | 89cd746c19d2bd5ef5db662c9c54d441bc4e941d | |
| parent | a787d59986446b3cd8cd2a0430a1f1baec4a805d (diff) | |
msm: mdss: Remove usage of deprecated macro MDSS_MDP_REG_INTF_OFFSET
MDSS_MDP_REG_INTF_OFFSET macro is deprecated and should not be used,
instead get the interface offset from device tree.
Change-Id: I3da39a17fdf8ffc4cc7d48a3b0cb2e2d39b020db
Signed-off-by: Jayant Shekhar <jshekhar@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_hwio.h | 2 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_intf_video.c | 16 |
2 files changed, 7 insertions, 11 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_hwio.h b/drivers/video/fbdev/msm/mdss_mdp_hwio.h index 9320a6e968f6..9953b78f6a0b 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_hwio.h +++ b/drivers/video/fbdev/msm/mdss_mdp_hwio.h @@ -474,8 +474,6 @@ enum mdss_mpd_intf_index { MDSS_MDP_MAX_INTF }; -#define MDSS_MDP_REG_INTF_OFFSET(intf) (0x20F00 + ((intf) * 0x200)) - #define MDSS_MDP_REG_INTF_TIMING_ENGINE_EN 0x000 #define MDSS_MDP_REG_INTF_CONFIG 0x004 #define MDSS_MDP_REG_INTF_HSYNC_CTL 0x008 diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_video.c b/drivers/video/fbdev/msm/mdss_mdp_intf_video.c index 192336601083..84643de78181 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_intf_video.c +++ b/drivers/video/fbdev/msm/mdss_mdp_intf_video.c @@ -600,12 +600,16 @@ int mdss_mdp_video_reconfigure_splash_done(struct mdss_mdp_ctl *ctl, { struct mdss_panel_data *pdata; int i, ret = 0, off; - int mdss_mdp_rev = MDSS_MDP_REG_READ(MDSS_MDP_REG_HW_VERSION); - int mdss_v2_intf_off = 0; struct mdss_overlay_private *mdp5_data = mfd_to_mdp5_data(ctl->mfd); u32 data, flush; + struct mdss_mdp_video_ctx *ctx; off = 0; + ctx = (struct mdss_mdp_video_ctx *) ctl->priv_data; + if (!ctx) { + pr_err("invalid ctx for ctl=%d\n", ctl->num); + return -ENODEV; + } pdata = ctl->panel_data; @@ -634,13 +638,7 @@ int mdss_mdp_video_reconfigure_splash_done(struct mdss_mdp_ctl *ctl, } mdss_mdp_ctl_write(ctl, MDSS_MDP_REG_CTL_FLUSH, flush); - off = MDSS_MDP_REG_INTF_OFFSET(ctl->intf_num); - - if (mdss_mdp_rev >= MDSS_MDP_HW_REV_102) - mdss_v2_intf_off = 0xEC00; - - MDSS_MDP_REG_WRITE(off + MDSS_MDP_REG_INTF_TIMING_ENGINE_EN - - mdss_v2_intf_off, 0); + mdp_video_write(ctx, MDSS_MDP_REG_INTF_TIMING_ENGINE_EN, 0); /* wait for 1 VSYNC for the pipe to be unstaged */ msleep(20); |