commit 1c6b11387d25862320368fbef161256f5c041fbc
author Linux Build Service Account <lnxbuild@quicinc.com> Wed Jul 19 20:22:04 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jul 19 20:22:04 2017 -0700
tree 5b640fdb44d1d5dc69562b5be6fc101fddba0723
parent 61c3f904794b23ca656e1f78f9d031592b6750f7
parent 8536bcea52d9fc53d1a6e10bf6cf61f109134c7c

Merge "target: msm8909: Update rules to compile haptics support for msm8909."

platform/msm8909/include/platform/iomap.h

diff --git a/platform/msm8909/include/platform/iomap.h b/platform/msm8909/include/platform/iomap.h
index f0a7db9..9b59657 100644
--- a/platform/msm8909/include/platform/iomap.h
+++ b/platform/msm8909/include/platform/iomap.h
@@ -79,6 +79,9 @@
 
 #define CLK_CTL_BASE                0x1800000
 
+#define PMI_SECOND_SLAVE_OFFSET 0x1
+#define PMI_SECOND_SLAVE_ADDR_BASE (PMI_SECOND_SLAVE_OFFSET << 16)
+
 #define SPMI_BASE                   0x02000000
 #define SPMI_GENI_BASE              (SPMI_BASE + 0xA000)
 #define SPMI_PIC_BASE               (SPMI_BASE +  0x01800000)

target/msm8909/rules.mk

diff --git a/target/msm8909/rules.mk b/target/msm8909/rules.mk
index f2ae532..f5393c5 100644
--- a/target/msm8909/rules.mk
+++ b/target/msm8909/rules.mk
@@ -22,6 +22,7 @@
 	lib/ptable \
 	dev/gcdb/display \
 	dev/pmic/pm8x41 \
+	dev/qpnp_haptic \
 	dev/pmic/pmi8994 \
 	lib/libfdt