Merge "dev: qpnp_haptic: Fix bit-mask used to identify PMIC type"
diff --git a/target/init.c b/target/init.c
index 517793d..5ec4ab6 100644
--- a/target/init.c
+++ b/target/init.c
@@ -43,8 +43,8 @@
#include <pm_fg_adc_usr.h>
#endif
-#include <partition_parser.h>
#if VERIFIED_BOOT || VERIFIED_BOOT_2
+#include <partition_parser.h>
#include <ab_partition_parser.h>
#endif
@@ -300,7 +300,7 @@
}
return ret;
}
-
+#if VERIFIED_BOOT || VERIFIED_BOOT_2
int target_get_vb_version()
{
if (vb_version == INVALID)
@@ -315,6 +315,12 @@
}
return vb_version;
}
+#else
+int target_get_vb_version()
+{
+ return vb_version;
+}
+#endif
#if VERIFIED_BOOT_LE
int verified_boot_le = 1;
diff --git a/target/msm8953/include/target/display.h b/target/msm8953/include/target/display.h
index 07b3f26..a70edf1 100755
--- a/target/msm8953/include/target/display.h
+++ b/target/msm8953/include/target/display.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, 2018, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -66,7 +66,7 @@
/*---------------------------------------------------------------------------*/
#define DISPLAY_CMDLINE_PREFIX " mdss_mdp.panel="
-#define MIPI_FB_ADDR 0x90100000
+#define MIPI_FB_ADDR 0x90000000
#define MIPI_HSYNC_PULSE_WIDTH 12
#define MIPI_HSYNC_BACK_PORCH_DCLK 32
diff --git a/target/msm8953/init.c b/target/msm8953/init.c
index 057ff4b..2195f83 100644
--- a/target/msm8953/init.c
+++ b/target/msm8953/init.c
@@ -75,6 +75,9 @@
#define PMIC_ARB_OWNER_ID 0
#define TLMM_VOL_UP_BTN_GPIO 85
+#define PRI_PMIC_SLAVE_ID 0
+#define SEC_PMIC_SLAVE_ID 2
+
#define FASTBOOT_MODE 0x77665500
#define RECOVERY_MODE 0x77665502
#define PON_SOFT_RB_SPARE 0x88F
@@ -705,12 +708,21 @@
void pmic_reset_configure(uint8_t reset_type)
{
uint32_t pmi_type;
+ uint8_t sec_reset_type = reset_type;
pmi_type = target_get_pmic();
if (pmi_type == PMIC_IS_PMI632)
+ {
pmi632_reset_configure(reset_type);
+ }
else
- pm8994_reset_configure(reset_type);
+ {
+ if (reset_type == PON_PSHOLD_HARD_RESET)
+ sec_reset_type = PON_PSHOLD_SHUTDOWN;
+
+ pm8996_reset_configure(PRI_PMIC_SLAVE_ID, reset_type);
+ pm8996_reset_configure(SEC_PMIC_SLAVE_ID, sec_reset_type);
+ }
}
struct qmp_reg qmp_settings[] =