Renaming mdmcalifornium to mdm9650.
Change-Id: I3573167631c6db79f7c2d4860db800914e18b77a
diff --git a/include/platform.h b/include/platform.h
index 5bc065a..e29b006 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -85,7 +85,7 @@
void get_bootloader_version(unsigned char *buf);
void get_baseband_version(unsigned char *buf);
bool is_device_locked();
-bool platform_is_mdmcalifornium();
+bool platform_is_mdm9650();
bool platform_is_sdxhedgehog();
uint64_t platform_get_ddr_start();
bool platform_is_glink_enabled();
diff --git a/platform/mdm9640/acpuclock.c b/platform/mdm9640/acpuclock.c
index 38b1f22..74f86c9 100644
--- a/platform/mdm9640/acpuclock.c
+++ b/platform/mdm9640/acpuclock.c
@@ -116,8 +116,8 @@
ASSERT(0);
}
- if (platform_is_mdmcalifornium())
- ret = clk_get_set_enable("usb30_pipe_clk_mdmcalifornium", 0, 1);
+ if (platform_is_mdm9650())
+ ret = clk_get_set_enable("usb30_pipe_clk_mdm9650", 0, 1);
else if (platform_is_sdxhedgehog())
ret = clk_get_set_enable("usb30_pipe_clk_sdxhedgehog", 0, 1);
else
@@ -221,7 +221,7 @@
{
int ret =0;
- if (platform_is_mdmcalifornium())
+ if (platform_is_mdm9650())
ret = clk_get_set_enable("usb30_pipe_clk", 0, true);
else
ret = clk_get_set_enable("usb30_pipe_clk", 125000000, true);
@@ -316,7 +316,7 @@
int ret;
char clk_name[64];
- if (platform_is_mdmcalifornium())
+ if (platform_is_mdm9650())
{
if (instance == 1)
rpm_send_data(&CE1_CLK[GENERIC_ENABLE][0], 24, RPM_REQUEST_TYPE);
@@ -377,7 +377,7 @@
struct clk *src_clk;
char clk_name[64];
- if (platform_is_mdmcalifornium())
+ if (platform_is_mdm9650())
{
if (instance == 1)
rpm_send_data(&CE1_CLK[GENERIC_DISABLE][0], 24, RPM_REQUEST_TYPE);
diff --git a/platform/mdm9640/mdm9640-clock.c b/platform/mdm9640/mdm9640-clock.c
index b6ad898..bc47cac 100644
--- a/platform/mdm9640/mdm9640-clock.c
+++ b/platform/mdm9640/mdm9640-clock.c
@@ -412,14 +412,14 @@
};
-static struct branch_clk gcc_usb30_pipe_clk_mdmcalifornium = {
+static struct branch_clk gcc_usb30_pipe_clk_mdm9650 = {
.bcr_reg = (uint32_t *) USB3_PIPE_BCR,
.cbcr_reg = (uint32_t *) USB3_PIPE_CBCR,
.has_sibling = 1,
.halt_check = 0,
.c = {
- .dbg_name = "usb30_pipe_clk_mdmcalifornium",
+ .dbg_name = "usb30_pipe_clk_mdm9650",
.ops = &clk_ops_branch,
},
};
@@ -608,7 +608,7 @@
CLK_LOOKUP("usb30_master_clk", gcc_usb30_master_clk.c),
CLK_LOOKUP("usb30_master_clk_sdxhedgehog", gcc_usb30_master_clk_sdxhedgehog.c),
CLK_LOOKUP("usb30_pipe_clk", gcc_usb30_pipe_clk.c),
- CLK_LOOKUP("usb30_pipe_clk_mdmcalifornium", gcc_usb30_pipe_clk_mdmcalifornium.c),
+ CLK_LOOKUP("usb30_pipe_clk_mdm9650", gcc_usb30_pipe_clk_mdm9650.c),
CLK_LOOKUP("usb30_pipe_clk_sdxhedgehog", gcc_usb30_pipe_clk_sdxhedgehog.c),
CLK_LOOKUP("usb30_aux_clk", gcc_usb30_aux_clk.c),
diff --git a/platform/mdm9640/platform.c b/platform/mdm9640/platform.c
index 3cfced4..fb312cf 100644
--- a/platform/mdm9640/platform.c
+++ b/platform/mdm9640/platform.c
@@ -156,7 +156,7 @@
}
-bool platform_is_mdmcalifornium()
+bool platform_is_mdm9650()
{
uint32_t platform_id = board_platform_id();
bool ret;
@@ -198,7 +198,7 @@
{
uint32_t boot_config;
- if (platform_is_mdmcalifornium() || platform_is_sdxhedgehog())
+ if (platform_is_mdm9650() || platform_is_sdxhedgehog())
boot_config = BOOT_CONFIG_REG_V2;
/* Else the platform is 9x45 */
else if (board_soc_version() >= 0x20000)
diff --git a/platform/msm_shared/qusb2_phy.c b/platform/msm_shared/qusb2_phy.c
index ab64209..14aa425 100644
--- a/platform/msm_shared/qusb2_phy.c
+++ b/platform/msm_shared/qusb2_phy.c
@@ -49,7 +49,7 @@
return 0;
}
-__WEAK int platform_is_mdmcalifornium()
+__WEAK int platform_is_mdm9650()
{
return 0;
}
@@ -101,7 +101,7 @@
#if TCSR_PHY_CLK_SCHEME_SEL
se_clock = readl(TCSR_PHY_CLK_SCHEME_SEL) & 0x1;
#endif
- if (platform_is_msm8996() || platform_is_mdmcalifornium() || platform_is_msm8953())
+ if (platform_is_msm8996() || platform_is_mdm9650() || platform_is_msm8953())
{
if(platform_is_msm8996sg())
writel(0xD0, QUSB2PHY_PORT_TUNE1);
diff --git a/target/mdm9640/init.c b/target/mdm9640/init.c
index 803bef0..6eabed2 100644
--- a/target/mdm9640/init.c
+++ b/target/mdm9640/init.c
@@ -214,7 +214,7 @@
{
uint8_t reset_type = 0;
- if (platform_is_mdmcalifornium() || platform_is_sdxhedgehog())
+ if (platform_is_mdm9650() || platform_is_sdxhedgehog())
{
/* Clear the boot partition select cookie to indicate
* its a normal reset and avoid going to download mode */
@@ -229,9 +229,9 @@
else
reset_type = PON_PSHOLD_HARD_RESET;
- if (platform_is_mdmcalifornium() || platform_is_sdxhedgehog())
+ if (platform_is_mdm9650() || platform_is_sdxhedgehog())
{
- /* PMD9655 is the PMIC used for MDMcalifornium */
+ /* PMD9655 is the PMIC used for MDM9650 */
pm8x41_reset_configure(reset_type);
} else {
/* Configure PMIC for warm reset */
@@ -468,10 +468,10 @@
void target_usb_phy_reset(void)
{
- /* Reset sequence for californium is different from 9x40, use the reset sequence
+ /* Reset sequence for 9650 is different from 9x40, use the reset sequence
* from clock driver
*/
- if (platform_is_mdmcalifornium() || platform_is_sdxhedgehog())
+ if (platform_is_mdm9650() || platform_is_sdxhedgehog())
clock_reset_usb_phy(); // This is the reset function for USB3
else
usb30_qmp_phy_reset();
@@ -502,7 +502,7 @@
uint32_t target_override_pll()
{
- if (platform_is_mdmcalifornium() || platform_is_sdxhedgehog())
+ if (platform_is_mdm9650() || platform_is_sdxhedgehog())
return 0;
else
return 1;
@@ -513,7 +513,7 @@
return board_hlos_subtype();
}
-/* QMP settings are different from californium when compared to v2.0/v1.0 hardware.
+/* QMP settings are different from 9650 when compared to v2.0/v1.0 hardware.
* Use the QMP settings from target code to keep the common driver clean
*/
struct qmp_reg qmp_settings[] =
@@ -609,7 +609,7 @@
struct qmp_reg *target_get_qmp_settings()
{
- if (platform_is_mdmcalifornium() || platform_is_sdxhedgehog())
+ if (platform_is_mdm9650() || platform_is_sdxhedgehog())
return qmp_settings;
else
return NULL;
@@ -617,7 +617,7 @@
int target_get_qmp_regsize()
{
- if (platform_is_mdmcalifornium() || platform_is_sdxhedgehog())
+ if (platform_is_mdm9650() || platform_is_sdxhedgehog())
return ARRAY_SIZE(qmp_settings);
else
return 0;
diff --git a/target/mdm9640/keypad.c b/target/mdm9640/keypad.c
index a79d80f..a95375d 100644
--- a/target/mdm9640/keypad.c
+++ b/target/mdm9640/keypad.c
@@ -45,7 +45,7 @@
{
int ret;
- if (platform_is_mdmcalifornium() || platform_is_sdxhedgehog())
+ if (platform_is_mdm9650() || platform_is_sdxhedgehog())
ret = pm8x41_resin_status();
else
{