Merge "aboot: mdtp: add delay before MDTP PIN is compared" into lk.lnx.1.0-dev.1.0
diff --git a/platform/msm_shared/mipi_dsi_autopll_thulium.c b/platform/msm_shared/mipi_dsi_autopll_thulium.c
index 83354b6..ffb1310 100644
--- a/platform/msm_shared/mipi_dsi_autopll_thulium.c
+++ b/platform/msm_shared/mipi_dsi_autopll_thulium.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, 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
@@ -116,10 +116,7 @@
pdb->out.plllock_cmp = (uint32_t)pll_comp_val;
pdb->out.pll_txclk_en = 1;
- if (board_soc_version() == 0x10000)
- pdb->out.cmn_ldo_cntrl = 0x1c;
- else
- pdb->out.cmn_ldo_cntrl = 0x3c;
+ pdb->out.cmn_ldo_cntrl = 0x3c;
}
static uint32_t mdss_mdp_pll_kvco_slop(uint32_t vrate)
diff --git a/target/init.c b/target/init.c
index d8d8073..ca64cd1 100644
--- a/target/init.c
+++ b/target/init.c
@@ -274,9 +274,12 @@
case MSMGOLD2:
case MSMGOLD3:
case APQGOLD:
+ case MSMTITANIUM:
+ case APQTITANIUM:
config->vib_type = VIB_LRA_TYPE;
config->hap_rate_cfg1 = QPNP_HAP_RATE_CFG1_41;
config->hap_rate_cfg2 = QPNP_HAP_RATE_CFG2_03;
+ break;
default:
dprintf(CRITICAL,"Unsupported platform id\n");
break;