commit bf75ed3238aecb1016140b8dc8b5d7f6109563ce
author Linux Build Service Account <lnxbuild@localhost> Sat Dec 13 09:14:56 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Dec 13 09:14:56 2014 -0800
tree 66c5eb01eb9f2814a8b40ffc36a3b57da440d234
parent 61d42f5cba4a415c2aefdd2ec5ea659d0f749d69
parent 982bdd8bd6e120466b31cb933453220fd59c9946

Merge "platform: add MDP interface 2 base address"

platform/msm8994/include/platform/iomap.h

diff --git a/platform/msm8994/include/platform/iomap.h b/platform/msm8994/include/platform/iomap.h
index 68ab72b..1774aa5 100644
--- a/platform/msm8994/include/platform/iomap.h
+++ b/platform/msm8994/include/platform/iomap.h
@@ -305,6 +305,7 @@
 #undef MDP_INTF_1_TIMING_ENGINE_EN
 #endif
 #define MDP_INTF_1_TIMING_ENGINE_EN             REG_MDP(0x6b800)
+#define MDP_INTF_2_TIMING_ENGINE_EN             REG_MDP(0x6C000)
 
 #ifdef MDP_CTL_0_BASE
 #undef MDP_CTL_0_BASE

platform/msm_shared/include/mdp5.h

diff --git a/platform/msm_shared/include/mdp5.h b/platform/msm_shared/include/mdp5.h
index 8e17def..07f1a12 100644
--- a/platform/msm_shared/include/mdp5.h
+++ b/platform/msm_shared/include/mdp5.h
@@ -98,6 +98,7 @@
 
 #define MDP_INTF_0_TIMING_ENGINE_EN             REG_MDP(0x12500)
 #define MDP_INTF_1_TIMING_ENGINE_EN             REG_MDP(0x12700)
+#define MDP_INTF_2_TIMING_ENGINE_EN             REG_MDP(0x12900)
 #define MDP_INTF_3_TIMING_ENGINE_EN             REG_MDP(0x12B00)
 
 #define MDP_CTL_0_BASE                          REG_MDP(0x600)