commit 92e6ec784f803cfe5f88177d7ea5c820d659114e
author Linux Build Service Account <lnxbuild@localhost> Wed Apr 18 23:40:39 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Apr 18 23:40:39 2018 -0700
tree 4e1a35ed0cd9ce857e287d0da1d395f318094993
parent ebd40adafc4967b8006b22b21bebfd59c6854768
parent 4b0cc134b87b4e75eb0acd52909b4a11d7054cb1

Merge "dev: qpnp_haptic: Fix bit-mask used to identify PMIC type"

dev/qpnp_haptic/qpnp_vib.c

diff --git a/dev/qpnp_haptic/qpnp_vib.c b/dev/qpnp_haptic/qpnp_vib.c
index fecb794..097e486 100644
--- a/dev/qpnp_haptic/qpnp_vib.c
+++ b/dev/qpnp_haptic/qpnp_vib.c
@@ -31,7 +31,7 @@
 
 void pm_vib_turn_on()
 {
-	if ((board_pmic_target(1) & 0xffff) == PMIC_IS_PMI632)
+	if ((board_pmic_target(1) & PMIC_TYPE_MASK) == PMIC_IS_PMI632)
 		pm_vib_ldo_turn_on();
 	else
 		pm_haptic_vib_turn_on();
@@ -39,7 +39,7 @@
 
 void pm_vib_turn_off()
 {
-	if ((board_pmic_target(1) & 0xffff) == PMIC_IS_PMI632)
+	if ((board_pmic_target(1) & PMIC_TYPE_MASK) == PMIC_IS_PMI632)
 		pm_vib_ldo_turn_off();
 	else
 		pm_haptic_vib_turn_off();

platform/msm_shared/include/board.h

diff --git a/platform/msm_shared/include/board.h b/platform/msm_shared/include/board.h
index 866fba2..90f7081 100644
--- a/platform/msm_shared/include/board.h
+++ b/platform/msm_shared/include/board.h
@@ -36,6 +36,8 @@
 #define BOARD_SOC_VERSION2     0x20000
 #define MAX_PMIC_DEVICES       SMEM_MAX_PMIC_DEVICES
 
+#define PMIC_TYPE_MASK 0xff
+
 struct board_pmic_data {
 	uint32_t pmic_type;
 	uint32_t pmic_version;

target/msm8952/init.c

diff --git a/target/msm8952/init.c b/target/msm8952/init.c
index a7c3469..b748803 100644
--- a/target/msm8952/init.c
+++ b/target/msm8952/init.c
@@ -294,7 +294,7 @@
 			uint8_t pmi_rev = 0;
 			uint32_t pmi_type = 0;
 
-			pmi_type = board_pmic_target(1) & 0xffff;
+			pmi_type = board_pmic_target(1) & PMIC_TYPE_MASK;
 			if(pmi_type == PMIC_IS_PMI8950)
 			{
 				/* read pmic spare register for rev */
@@ -725,7 +725,7 @@
 uint32_t target_get_pmic()
 {
 	if (target_is_pmi_enabled()) {
-		uint32_t pmi_type = board_pmic_target(1) & 0xffff;
+		uint32_t pmi_type = board_pmic_target(1) & PMIC_TYPE_MASK;
 		if (pmi_type == PMIC_IS_PMI632)
 			return PMIC_IS_PMI632;
 		else

target/msm8953/init.c

diff --git a/target/msm8953/init.c b/target/msm8953/init.c
index 075bf09..2195f83 100644
--- a/target/msm8953/init.c
+++ b/target/msm8953/init.c
@@ -694,7 +694,7 @@
 uint32_t target_get_pmic()
 {
 	if (target_is_pmi_enabled()) {
-		uint32_t pmi_type = board_pmic_target(1) & 0xffff;
+		uint32_t pmi_type = board_pmic_target(1) & PMIC_TYPE_MASK;
 		if (pmi_type == PMIC_IS_PMI632)
 			return PMIC_IS_PMI632;
 		else