commit 943f534c05ad69b219a61696be3acb9c83081476
author Linux Build Service Account <lnxbuild@localhost> Thu Feb 23 21:19:31 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Feb 23 21:19:31 2017 -0800
tree 94147de7d97a3cba4af66d06fbe428b5661bec47
parent 84edb60b29cad4bc1e37b75ae89b1ef2aceae43c
parent a2f6f9c47daa4394a23e508a08501eba3ede1311

Merge "lk: Renaming mdmcalfornium to mdm9650."

platform/mdm9640/platform.c

diff --git a/platform/mdm9640/platform.c b/platform/mdm9640/platform.c
index fb312cf..37a9aa2 100644
--- a/platform/mdm9640/platform.c
+++ b/platform/mdm9640/platform.c
@@ -163,10 +163,10 @@
 
 	switch(platform_id)
 	{
-		case MDMCALIFORNIUM1:
-		case MDMCALIFORNIUM2:
-		case MDMCALIFORNIUM3:
-		case MDMCALIFORNIUM4:
+		case MDM9650:
+		case MDM9655:
+		case MDM9250:
+		case MDM9255:
 				ret = true;
 				break;
 		default:

platform/msm_shared/smem.h

diff --git a/platform/msm_shared/smem.h b/platform/msm_shared/smem.h
index 257fcb1..9a46d1d 100644
--- a/platform/msm_shared/smem.h
+++ b/platform/msm_shared/smem.h
@@ -432,11 +432,11 @@
 	FSM9916  = 276,
 	APQ8076  = 277,
 	MSM8976  = 278,
-	MDMCALIFORNIUM1  = 279,
-	MDMCALIFORNIUM2  = 283,
-	MDMCALIFORNIUM3  = 284,
-	MDMCALIFORNIUM4  = 285,
-	MDMCALIFORNIUM5  = 286,
+	MDM9650  = 279,
+	MDM9655  = 283,
+	MDM9250  = 284,
+	MDM9255  = 285,
+	MDM9350  = 286,
 	APQ8052  = 289,
 	MDM9607 = 290,
 	MDM8207  = 296,