Merge "apq8098: rename apq8998 to apq8098"

17 files changed, 63 insertions, 63 deletions

diff --git a/Documentation/devicetree/bindings/arm/msm/msm.txt b/Documentation/devicetree/bindings/arm/msm/msm.txt
index 02bf809740c3..5647b22eede0 100644
--- a/Documentation/devicetree/bindings/arm/msm/msm.txt
+++ b/Documentation/devicetree/bindings/arm/msm/msm.txt
@@ -48,7 +48,7 @@ SoCs:
   compatible = "qcom,apqtitanium"
 
 - APQ8998
-  compatible = "qcom,apq8998"
+  compatible = "qcom,apq8098"
 
 - MDM9630
   compatible = "qcom,mdm9630"
@@ -195,9 +195,9 @@ compatible = "qcom,apq8037-cdp"
 compatible = "qcom,apq8037-mtp"
 compatible = "qcom,apqtitanium-cdp"
 compatible = "qcom,apqtitanium-mtp"
-compatible = "qcom,apq8998-cdp"
-compatible = "qcom,apq8998-mtp"
-compatible = "qcom,apq8998-qrd"
+compatible = "qcom,apq8098-cdp"
+compatible = "qcom,apq8098-mtp"
+compatible = "qcom,apq8098-qrd"
 compatible = "qcom,mdm9630-cdp"
 compatible = "qcom,mdm9630-mtp"
 compatible = "qcom,mdm9630-sim"
diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile
index 351fdc160079..0b60560281c7 100644
--- a/arch/arm/boot/dts/qcom/Makefile
+++ b/arch/arm/boot/dts/qcom/Makefile
@@ -134,19 +134,19 @@ dtb-$(CONFIG_ARCH_MSM8998) += msm8998-sim.dtb \
 	msm8998-v2-qrd-vr1.dtb \
 	msm8998-v2-qrd-skuk-evt3.dtb \
 	msm8998-v2-qrd-skuk-hdk.dtb \
-	apq8998-mtp.dtb \
-	apq8998-cdp.dtb \
-	apq8998-v2-mtp.dtb \
-	apq8998-v2-cdp.dtb \
-	apq8998-v2-qrd.dtb \
-	apq8998-v2-qrd-skuk-hdk.dtb \
+	apq8098-mtp.dtb \
+	apq8098-cdp.dtb \
+	apq8098-v2-mtp.dtb \
+	apq8098-v2-cdp.dtb \
+	apq8098-v2-qrd.dtb \
+	apq8098-v2-qrd-skuk-hdk.dtb \
 	msm8998-v2.1-mtp.dtb \
 	msm8998-v2.1-cdp.dtb \
 	msm8998-v2.1-qrd.dtb \
-	apq8998-v2.1-mtp.dtb \
-	apq8998-v2.1-cdp.dtb \
-	apq8998-v2.1-qrd.dtb \
-	apq8998-v2.1-mediabox.dtb \
+	apq8098-v2.1-mtp.dtb \
+	apq8098-v2.1-cdp.dtb \
+	apq8098-v2.1-qrd.dtb \
+	apq8098-v2.1-mediabox.dtb \
 	msm8998-v2.1-interposer-sdm660-cdp.dtb \
 	msm8998-v2.1-interposer-sdm660-mtp.dtb \
 	msm8998-v2.1-interposer-sdm660-qrd.dtb
diff --git a/arch/arm/boot/dts/qcom/apq8998-cdp.dts b/arch/arm/boot/dts/qcom/apq8098-cdp.dts
index 8acd2dabe18a..c8011ff957c0 100644
--- a/arch/arm/boot/dts/qcom/apq8998-cdp.dts
+++ b/arch/arm/boot/dts/qcom/apq8098-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -12,11 +12,11 @@
 
 /dts-v1/;
 
-#include "apq8998.dtsi"
+#include "apq8098.dtsi"
 #include "msm8998-cdp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ 8998 CDP";
-	compatible = "qcom,apq8998-cdp", "qcom,apq8998", "qcom,cdp";
+	model = "Qualcomm Technologies, Inc. APQ 8098 CDP";
+	compatible = "qcom,apq8098-cdp", "qcom,apq8098", "qcom,cdp";
 	qcom,board-id = <1 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/apq8998-mtp.dts b/arch/arm/boot/dts/qcom/apq8098-mtp.dts
index 5bed816f77d6..7af82a91e935 100644
--- a/arch/arm/boot/dts/qcom/apq8998-mtp.dts
+++ b/arch/arm/boot/dts/qcom/apq8098-mtp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -12,11 +12,11 @@
 
 /dts-v1/;
 
-#include "apq8998.dtsi"
+#include "apq8098.dtsi"
 #include "msm8998-mtp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ 8998 MTP";
-	compatible = "qcom,apq8998-mtp", "qcom,apq8998", "qcom,mtp";
+	model = "Qualcomm Technologies, Inc. APQ 8098 MTP";
+	compatible = "qcom,apq8098-mtp", "qcom,apq8098", "qcom,mtp";
 	qcom,board-id = <8 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/apq8998-v2.1-cdp.dts b/arch/arm/boot/dts/qcom/apq8098-v2-cdp.dts
index 94c6031854fa..b01c85bdbac6 100644
--- a/arch/arm/boot/dts/qcom/apq8998-v2.1-cdp.dts
+++ b/arch/arm/boot/dts/qcom/apq8098-v2-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -12,11 +12,11 @@
 
 /dts-v1/;
 
-#include "apq8998-v2.1.dtsi"
+#include "apq8098-v2.dtsi"
 #include "msm8998-cdp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ 8998 V2.1 CDP";
-	compatible = "qcom,apq8998-cdp", "qcom,apq8998", "qcom,cdp";
+	model = "Qualcomm Technologies, Inc. APQ 8098 V2 CDP";
+	compatible = "qcom,apq8098-cdp", "qcom,apq8098", "qcom,cdp";
 	qcom,board-id = <1 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/apq8998-v2.1-mtp.dts b/arch/arm/boot/dts/qcom/apq8098-v2-mtp.dts
index fa4e28e515b5..a6e6f15bfa34 100644
--- a/arch/arm/boot/dts/qcom/apq8998-v2.1-mtp.dts
+++ b/arch/arm/boot/dts/qcom/apq8098-v2-mtp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -12,11 +12,11 @@
 
 /dts-v1/;
 
-#include "apq8998-v2.1.dtsi"
+#include "apq8098-v2.dtsi"
 #include "msm8998-mtp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ 8998 V2.1 MTP";
-	compatible = "qcom,apq8998-mtp", "qcom,apq8998", "qcom,mtp";
+	model = "Qualcomm Technologies, Inc. APQ 8098 V2 MTP";
+	compatible = "qcom,apq8098-mtp", "qcom,apq8098", "qcom,mtp";
 	qcom,board-id = <8 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/apq8998-v2-qrd-skuk-hdk.dts b/arch/arm/boot/dts/qcom/apq8098-v2-qrd-skuk-hdk.dts
index 6406fe52242d..7aeb8e36cca2 100644
--- a/arch/arm/boot/dts/qcom/apq8998-v2-qrd-skuk-hdk.dts
+++ b/arch/arm/boot/dts/qcom/apq8098-v2-qrd-skuk-hdk.dts
@@ -13,11 +13,11 @@
 
 /dts-v1/;
 
-#include "apq8998-v2.dtsi"
+#include "apq8098-v2.dtsi"
 #include "msm8998-qrd-skuk-hdk.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ 8998 SKUK HDK";
+	model = "Qualcomm Technologies, Inc. APQ 8098 SKUK HDK";
 	compatible = "qcom,msm8998-qrd", "qcom,msm8998", "qcom,qrd";
 	qcom,board-id = <0x06000b 0x10>;
 };
diff --git a/arch/arm/boot/dts/qcom/apq8998-v2-qrd.dts b/arch/arm/boot/dts/qcom/apq8098-v2-qrd.dts
index 4f7efa7b4357..0b808e47c915 100644
--- a/arch/arm/boot/dts/qcom/apq8998-v2-qrd.dts
+++ b/arch/arm/boot/dts/qcom/apq8098-v2-qrd.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -12,11 +12,11 @@
 
 /dts-v1/;
 
-#include "apq8998-v2.dtsi"
+#include "apq8098-v2.dtsi"
 #include "msm8998-qrd.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ 8998 V2 QRD";
-	compatible = "qcom,apq8998-qrd", "qcom,apq8998", "qcom,qrd";
+	model = "Qualcomm Technologies, Inc. APQ 8098 V2 QRD";
+	compatible = "qcom,apq8098-qrd", "qcom,apq8098", "qcom,qrd";
 	qcom,board-id = <11 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/apq8998-v2-cdp.dts b/arch/arm/boot/dts/qcom/apq8098-v2.1-cdp.dts
index 397892dbb540..e41a66eff103 100644
--- a/arch/arm/boot/dts/qcom/apq8998-v2-cdp.dts
+++ b/arch/arm/boot/dts/qcom/apq8098-v2.1-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -12,11 +12,11 @@
 
 /dts-v1/;
 
-#include "apq8998-v2.dtsi"
+#include "apq8098-v2.1.dtsi"
 #include "msm8998-cdp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ 8998 V2 CDP";
-	compatible = "qcom,apq8998-cdp", "qcom,apq8998", "qcom,cdp";
+	model = "Qualcomm Technologies, Inc. APQ 8098 V2.1 CDP";
+	compatible = "qcom,apq8098-cdp", "qcom,apq8098", "qcom,cdp";
 	qcom,board-id = <1 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/apq8998-v2.1-mediabox.dts b/arch/arm/boot/dts/qcom/apq8098-v2.1-mediabox.dts
index 9d4b1457f990..d9b1cb8741eb 100644
--- a/arch/arm/boot/dts/qcom/apq8998-v2.1-mediabox.dts
+++ b/arch/arm/boot/dts/qcom/apq8098-v2.1-mediabox.dts
@@ -12,12 +12,12 @@
 
 /dts-v1/;
 
-#include "apq8998-v2.1.dtsi"
+#include "apq8098-v2.1.dtsi"
 #include "msm8998-cdp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ 8998 V2.1 mediabox";
-	compatible = "qcom,apq8998-cdp", "qcom,apq8998", "qcom,cdp";
+	model = "Qualcomm Technologies, Inc. APQ 8098 V2.1 mediabox";
+	compatible = "qcom,apq8098-cdp", "qcom,apq8098", "qcom,cdp";
 	qcom,board-id = <8 1>;
 };
 
diff --git a/arch/arm/boot/dts/qcom/apq8998-v2-mtp.dts b/arch/arm/boot/dts/qcom/apq8098-v2.1-mtp.dts
index 4dc735c8d182..5684e1849b0d 100644
--- a/arch/arm/boot/dts/qcom/apq8998-v2-mtp.dts
+++ b/arch/arm/boot/dts/qcom/apq8098-v2.1-mtp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -12,11 +12,11 @@
 
 /dts-v1/;
 
-#include "apq8998-v2.dtsi"
+#include "apq8098-v2.1.dtsi"
 #include "msm8998-mtp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ 8998 V2 MTP";
-	compatible = "qcom,apq8998-mtp", "qcom,apq8998", "qcom,mtp";
+	model = "Qualcomm Technologies, Inc. APQ 8098 V2.1 MTP";
+	compatible = "qcom,apq8098-mtp", "qcom,apq8098", "qcom,mtp";
 	qcom,board-id = <8 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/apq8998-v2.1-qrd.dts b/arch/arm/boot/dts/qcom/apq8098-v2.1-qrd.dts
index 6a91b966a9b7..0f315d7c893d 100644
--- a/arch/arm/boot/dts/qcom/apq8998-v2.1-qrd.dts
+++ b/arch/arm/boot/dts/qcom/apq8098-v2.1-qrd.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -12,11 +12,11 @@
 
 /dts-v1/;
 
-#include "apq8998-v2.1.dtsi"
+#include "apq8098-v2.1.dtsi"
 #include "msm8998-qrd.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ 8998 V2.1 QRD";
-	compatible = "qcom,apq8998-qrd", "qcom,apq8998", "qcom,qrd";
+	model = "Qualcomm Technologies, Inc. APQ 8098 V2.1 QRD";
+	compatible = "qcom,apq8098-qrd", "qcom,apq8098", "qcom,qrd";
 	qcom,board-id = <11 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/apq8998-v2.1.dtsi b/arch/arm/boot/dts/qcom/apq8098-v2.1.dtsi
index c7d44816c7d6..a5fa81b71537 100644
--- a/arch/arm/boot/dts/qcom/apq8998-v2.1.dtsi
+++ b/arch/arm/boot/dts/qcom/apq8098-v2.1.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -13,6 +13,6 @@
 #include "msm8998-v2.1.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ 8998 V2.1";
+	model = "Qualcomm Technologies, Inc. APQ 8098 V2.1";
 	qcom,msm-id = <319 0x20001>;
 };
diff --git a/arch/arm/boot/dts/qcom/apq8998-v2.dtsi b/arch/arm/boot/dts/qcom/apq8098-v2.dtsi
index 2be3db45bf37..e51e310f7131 100644
--- a/arch/arm/boot/dts/qcom/apq8998-v2.dtsi
+++ b/arch/arm/boot/dts/qcom/apq8098-v2.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -13,6 +13,6 @@
 #include "msm8998-v2.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ 8998 V2";
+	model = "Qualcomm Technologies, Inc. APQ 8098 V2";
 	qcom,msm-id = <319 0x20000>;
 };
diff --git a/arch/arm/boot/dts/qcom/apq8998.dtsi b/arch/arm/boot/dts/qcom/apq8098.dtsi
index 99d3459e39ce..8cb0c6b17689 100644
--- a/arch/arm/boot/dts/qcom/apq8998.dtsi
+++ b/arch/arm/boot/dts/qcom/apq8098.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -13,7 +13,7 @@
 #include "msm8998.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ 8998";
+	model = "Qualcomm Technologies, Inc. APQ 8098";
 	qcom,msm-id = <319 0x10000>;
 };
 
diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c
index 353a3cb66ba8..c1d8748a5d08 100644
--- a/drivers/soc/qcom/socinfo.c
+++ b/drivers/soc/qcom/socinfo.c
@@ -531,7 +531,7 @@ static struct msm_soc_info cpu_of_id[] = {
 
 	/* Cobalt IDs */
 	[292] = {MSM_CPU_8998, "MSM8998"},
-	[319] = {MSM_CPU_8998, "APQ8998"},
+	[319] = {MSM_CPU_8998, "APQ8098"},
 
 	/* Hamster ID */
 	[306] = {MSM_CPU_HAMSTER, "MSMHAMSTER"},
@@ -1265,9 +1265,9 @@ static void * __init setup_dummy_socinfo(void)
 		dummy_socinfo.id = 327;
 		strlcpy(dummy_socinfo.build_id, "sda630 - ",
 			sizeof(dummy_socinfo.build_id));
-	} else if (early_machine_is_apq8998()) {
+	} else if (early_machine_is_apq8098()) {
 		dummy_socinfo.id = 319;
-		strlcpy(dummy_socinfo.build_id, "apq8998 - ",
+		strlcpy(dummy_socinfo.build_id, "apq8098 - ",
 			sizeof(dummy_socinfo.build_id));
 	}
 
diff --git a/include/soc/qcom/socinfo.h b/include/soc/qcom/socinfo.h
index ac36df5769ee..dfb0280d146c 100644
--- a/include/soc/qcom/socinfo.h
+++ b/include/soc/qcom/socinfo.h
@@ -90,8 +90,8 @@
 	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8929")
 #define early_machine_is_msm8998()	\
 	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8998")
-#define early_machine_is_apq8998()	\
-	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,apq8998")
+#define early_machine_is_apq8098()	\
+	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,apq8098")
 #define early_machine_is_msmhamster()	\
 	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmhamster")
 #define early_machine_is_sdm660()	\
@@ -140,7 +140,7 @@
 #define early_machine_is_msm8976() 0
 #define early_machine_is_msm8929()	0
 #define early_machine_is_msm8998()	0
-#define early_machine_is_apq8998()	0
+#define early_machine_is_apq8098()	0
 #define early_machine_is_msmhamster()	0
 #define early_machine_is_sdm660()	0
 #define early_machine_is_sda660()	0