msm: Back merge rel to dev for SDM660/SDM630 renaming

Change-Id: Idd3880bb1570fac9a6f4f4008a1ca48384f8e3a4
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>

6 files changed, 21 insertions, 21 deletions

diff --git a/include/dt-bindings/clock/qcom,gcc-msmfalcon.h b/include/dt-bindings/clock/qcom,gcc-sdm660.h
index aa76fbad5083..4bf87f6c08bf 100644
--- a/include/dt-bindings/clock/qcom,gcc-msmfalcon.h
+++ b/include/dt-bindings/clock/qcom,gcc-sdm660.h
@@ -11,8 +11,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _DT_BINDINGS_CLK_MSM_GCC_FALCON_H
-#define _DT_BINDINGS_CLK_MSM_GCC_FALCON_H
+#ifndef _DT_BINDINGS_CLK_MSM_GCC_660_H
+#define _DT_BINDINGS_CLK_MSM_GCC_660_H
 
 /* Hardware/Dummy/Voter clocks */
 #define GCC_XO					0
diff --git a/include/dt-bindings/clock/qcom,gpu-msmfalcon.h b/include/dt-bindings/clock/qcom,gpu-sdm660.h
index 2ef1e34db3a1..80b49d3420e3 100644
--- a/include/dt-bindings/clock/qcom,gpu-msmfalcon.h
+++ b/include/dt-bindings/clock/qcom,gpu-sdm660.h
@@ -11,8 +11,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _DT_BINDINGS_CLK_MSM_GPU_FALCON_H
-#define _DT_BINDINGS_CLK_MSM_GPU_FALCON_H
+#ifndef _DT_BINDINGS_CLK_MSM_GPU_660_H
+#define _DT_BINDINGS_CLK_MSM_GPU_660_H
 
 #define GFX3D_CLK_SRC						0
 #define GPU_PLL0_PLL						1
diff --git a/include/dt-bindings/clock/qcom,mmcc-msmfalcon.h b/include/dt-bindings/clock/qcom,mmcc-sdm660.h
index 91309b4616a6..cc7c0033d6ea 100644
--- a/include/dt-bindings/clock/qcom,mmcc-msmfalcon.h
+++ b/include/dt-bindings/clock/qcom,mmcc-sdm660.h
@@ -11,8 +11,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _DT_BINDINGS_CLK_MSM_MMCC_FALCON_H
-#define _DT_BINDINGS_CLK_MSM_MMCC_FALCON_H
+#ifndef _DT_BINDINGS_CLK_MSM_MMCC_660_H
+#define _DT_BINDINGS_CLK_MSM_MMCC_660_H
 
 #define MMSS_CAMSS_JPEG0_VOTE_CLK		 0
 #define MMSS_CAMSS_JPEG0_DMA_VOTE_CLK		 1
diff --git a/include/linux/qpnp/qpnp-revid.h b/include/linux/qpnp/qpnp-revid.h
index 8d9bbfd67992..4023e3a683d3 100644
--- a/include/linux/qpnp/qpnp-revid.h
+++ b/include/linux/qpnp/qpnp-revid.h
@@ -177,9 +177,9 @@
 /* PMI8998 */
 #define PMI8998_SUBTYPE	0x15
 
-/* PMFALCON */
-#define PM2FALCON_SUBTYPE	0x1A
-#define PMFALCON_SUBTYPE	0x1B
+/* PM660 */
+#define PM660L_SUBTYPE	0x1A
+#define PM660_SUBTYPE	0x1B
 
 #define PMI8998_V1P0_REV1	0x00
 #define PMI8998_V1P0_REV2	0x00
diff --git a/include/soc/qcom/socinfo.h b/include/soc/qcom/socinfo.h
index 3e5f7be53204..611bdf856d1d 100644
--- a/include/soc/qcom/socinfo.h
+++ b/include/soc/qcom/socinfo.h
@@ -94,12 +94,12 @@
 	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,apq8998")
 #define early_machine_is_msmhamster()	\
 	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmhamster")
-#define early_machine_is_msmfalcon()	\
-	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmfalcon")
-#define early_machine_is_apqfalcon()	\
-	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,apqfalcon")
-#define early_machine_is_msmtriton()	\
-	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmtriton")
+#define early_machine_is_sdm660()	\
+	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm660")
+#define early_machine_is_sda660()	\
+	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sda660")
+#define early_machine_is_sdm630()	\
+	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm630")
 #else
 #define of_board_is_sim()		0
 #define of_board_is_rumi()		0
@@ -136,9 +136,9 @@
 #define early_machine_is_msm8998()	0
 #define early_machine_is_apq8998()	0
 #define early_machine_is_msmhamster()	0
-#define early_machine_is_msmfalcon()	0
-#define early_machine_is_apqfalcon()	0
-#define early_machine_is_msmtriton()	0
+#define early_machine_is_sdm660()	0
+#define early_machine_is_sda660()	0
+#define early_machine_is_sdm630()	0
 #endif
 
 #define PLATFORM_SUBTYPE_MDM	1
@@ -197,8 +197,8 @@ enum msm_cpu {
 	MSM_CPU_8929,
 	MSM_CPU_8998,
 	MSM_CPU_HAMSTER,
-	MSM_CPU_FALCON,
-	MSM_CPU_TRITON,
+	MSM_CPU_660,
+	MSM_CPU_630,
 };
 
 struct msm_soc_info {
diff --git a/include/uapi/linux/msm_mdp.h b/include/uapi/linux/msm_mdp.h
index 4df3845c159c..fca2a3c2d494 100644
--- a/include/uapi/linux/msm_mdp.h
+++ b/include/uapi/linux/msm_mdp.h
@@ -118,7 +118,7 @@
 #define MDSS_MDP_HW_REV_116	MDSS_MDP_REV(1, 16, 0) /* msmtitanium */
 #define MDSS_MDP_HW_REV_300	MDSS_MDP_REV(3, 0, 0)  /* msm8998 */
 #define MDSS_MDP_HW_REV_301	MDSS_MDP_REV(3, 0, 1)  /* msm8998 v1.0 */
-#define MDSS_MDP_HW_REV_320	MDSS_MDP_REV(3, 2, 0)  /* msmfalcon */
+#define MDSS_MDP_HW_REV_320	MDSS_MDP_REV(3, 2, 0)  /* sdm660 */
 
 enum {
 	NOTIFY_UPDATE_INIT,