msm: Rename msmtriton/apqtriton to sdm630/sda630

Update the code name from msmtriton/apqtriton to sdm630/sda630.
As part of this, update the filename containing "triton" and
files content containing "triton".

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

Documentation/devicetree/bindings/arm/msm/msm.txt

@@ -95,8 +95,8 @@ SoCs:
 - SDA660
   compatible = "qcom,sda660"
 
-- MSMTRITON
-  compatible = "qcom,msmtriton"
+- SDM630
+  compatible = "qcom,sdm630"
 
 - MSM8952
   compatible = "qcom,msm8952"
@@ -270,7 +270,7 @@ compatible = "qcom,sdm660-mtp"
 compatible = "qcom,sdm660-qrd"
 compatible = "qcom,sda660-mtp"
 compatible = "qcom,sda660-cdp"
-compatible = "qcom,msmtriton-rumi"
+compatible = "qcom,sdm630-rumi"
 compatible = "qcom,msm8952-rumi"
 compatible = "qcom,msm8952-sim"
 compatible = "qcom,msm8952-qrd"

Documentation/devicetree/bindings/clock/qcom,gpucc.txt

@@ -5,7 +5,7 @@ Required properties :
 - compatible : shall contain only one of the following:
 
 			"qcom,gpucc-sdm660",
-			"qcom,gpucc-msmtriton"
+			"qcom,gpucc-sdm630"
 
 - reg : shall contain base register location and length
 - #clock-cells : shall contain 1

Documentation/devicetree/bindings/thermal/tsens.txt

@@ -32,7 +32,7 @@ Required properties:
 	       should be "qcom,msm8998-tsens" for 8998 TSENS driver.
 	       should be "qcom,msmhamster-tsens" for hamster TSENS driver.
 	       should be "qcom,sdm660-tsens" for 660 TSENS driver.
-	       should be "qcom,msmtriton-tsens" for triton TSENS driver.
+	       should be "qcom,sdm630-tsens" for 630 TSENS driver.
 	       The compatible property is used to identify the respective fusemap to use
 	       for the corresponding SoC.
 - reg : offset and length of the TSENS registers with associated property in reg-names

arch/arm/boot/dts/qcom/Makefile

@@ -161,7 +161,7 @@ dtb-$(CONFIG_ARCH_SDM660) += sdm660-sim.dtb \
 	sda660-pm660a-mtp.dtb \
 	sda660-pm660a-rcm.dtb
 
-dtb-$(CONFIG_ARCH_MSMTRITON) += msmtriton-rumi.dtb
+dtb-$(CONFIG_ARCH_SDM630) += sdm630-rumi.dtb
 
 ifeq ($(CONFIG_ARM64),y)
 always          := $(dtb-y)

arch/arm/boot/dts/qcom/sdm630-rumi.dts

@@ -13,12 +13,12 @@
 
 /dts-v1/;
 
-#include "msmtriton.dtsi"
+#include "sdm630.dtsi"
 #include "sdm660-pinctrl.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM TRITON RUMI";
-	compatible = "qcom,msmtriton-rumi", "qcom,msmtriton", "qcom,rumi";
+	model = "Qualcomm Technologies, Inc. SDM 630 RUMI";
+	compatible = "qcom,sdm630-rumi", "qcom,sdm630", "qcom,rumi";
 	qcom,board-id = <15 0>;
 
 	chosen {

arch/arm/boot/dts/qcom/sdm630.dtsi

@@ -19,8 +19,8 @@
 #include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>
 
 / {
-	model = "Qualcomm Technologies, Inc. MSMTRITON";
-	compatible = "qcom,msmtriton";
+	model = "Qualcomm Technologies, Inc. SDM630";
+	compatible = "qcom,sdm630";
 	qcom,msm-id = <318 0x0>;
 	interrupt-parent = <&intc>;
 
@@ -312,8 +312,8 @@
 	};
 };
 
-#include "msmtriton-smp2p.dtsi"
-#include "msmtriton-coresight.dtsi"
+#include "sdm630-smp2p.dtsi"
+#include "sdm630-coresight.dtsi"
 &soc {
 	#address-cells = <1>;
 	#size-cells = <1>;
@@ -450,7 +450,7 @@
 	};
 
 	tsens: tsens@10ad000 {
-		compatible = "qcom,msmtriton-tsens";
+		compatible = "qcom,sdm630-tsens";
 		reg = <0x10ad000 0x2000>;
 		reg-names = "tsens_physical";
 		interrupts = <0 184 0>, <0 430 0>;
@@ -758,7 +758,7 @@
 	};
 
 	clock_gfx: clock-controller@5065000 {
-		compatible = "qcom,gpucc-msmtriton";
+		compatible = "qcom,gpucc-sdm630";
 		reg = <0x5065000 0x10000>;
 		vdd_dig_gfx-supply = <&pm660l_s3_level>;
 		vdd_mx_gfx-supply = <&pm660l_s5_level>;
@@ -1239,15 +1239,15 @@
 	};
 };
 
-#include "msmtriton-ion.dtsi"
+#include "sdm630-ion.dtsi"
 #include "msm-pm660.dtsi"
 #include "msm-pm660l.dtsi"
 #include "msm-pm660-rpm-regulator.dtsi"
 #include "msm-pm660l-rpm-regulator.dtsi"
-#include "msmtriton-regulator.dtsi"
+#include "sdm630-regulator.dtsi"
 #include "msm-gdsc-660.dtsi"
 #include "sdm660-common.dtsi"
-#include "msm-arm-smmu-triton.dtsi"
+#include "msm-arm-smmu-630.dtsi"
 
 &gdsc_usb30 {
 	status = "ok";

arch/arm/configs/sdm660-perf_defconfig

@@ -47,7 +47,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_SDM660=y
-CONFIG_ARCH_MSMTRITON=y
+CONFIG_ARCH_SDM630=y
 CONFIG_ARM_KERNMEM_PERMS=y
 CONFIG_SMP=y
 CONFIG_SCHED_MC=y

arch/arm/configs/sdm660_defconfig

@@ -47,7 +47,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_SDM660=y
-CONFIG_ARCH_MSMTRITON=y
+CONFIG_ARCH_SDM630=y
 CONFIG_ARM_KERNMEM_PERMS=y
 CONFIG_SMP=y
 CONFIG_SCHED_MC=y

arch/arm/mach-qcom/Kconfig

@@ -39,8 +39,8 @@ config ARCH_SDM660
 	This enables support for the SDM660 chipset. If you do not
 	wish to build a kernel that runs on this chipset, say 'N' here.
 
-config ARCH_MSMTRITON
-        bool "Enable Support for MSMTRITON"
+config ARCH_SDM630
+        bool "Enable Support for SDM630"
 	select CLKDEV_LOOKUP
 	select HAVE_CLK
 	select HAVE_CLK_PREPARE
@@ -68,7 +68,7 @@ config ARCH_MSMTRITON
 	select MSM_RPM_SMD
 	select MSM_JTAGV8 if CORESIGHT_ETMV4
 	help
-	This enables support for the MSMTRITON chipset. If you do not
+	This enables support for the SDM630 chipset. If you do not
 	wish to build a kernel that runs on this chipset, say 'N' here.
 
 config ARCH_MSM8X60

arch/arm/mach-qcom/board-660.c

@@ -32,19 +32,19 @@ DT_MACHINE_START(SDM660_DT,
 	.dt_compat = sdm660_dt_match,
 MACHINE_END
 
-static const char *msmtriton_dt_match[] __initconst = {
-	"qcom,msmtriton",
-	"qcom,apqtriton",
+static const char *sdm630_dt_match[] __initconst = {
+	"qcom,sdm630",
+	"qcom,sda630",
 	NULL
 };
 
-static void __init msmtriton_init(void)
+static void __init sdm630_init(void)
 {
 	board_dt_populate(NULL);
 }
 
-DT_MACHINE_START(MSMTRITON_DT,
-	"Qualcomm Technologies, Inc. MSM TRITON (Flattened Device Tree)")
-	.init_machine = msmtriton_init,
-	.dt_compat = msmtriton_dt_match,
+DT_MACHINE_START(SDM630_DT,
+	"Qualcomm Technologies, Inc. SDM 630 (Flattened Device Tree)")
+	.init_machine = sdm630_init,
+	.dt_compat = sdm630_dt_match,
 MACHINE_END

arch/arm64/Kconfig.platforms

@@ -97,14 +97,14 @@ config ARCH_SDM660
 	  If you do not wish to build a kernel that runs
 	  on this chipset,say 'N' here.
 
-config ARCH_MSMTRITON
-	bool "Enable Support for Qualcomm Technologies Inc MSMTRITON"
+config ARCH_SDM630
+	bool "Enable Support for Qualcomm Technologies Inc SDM630"
 	depends on ARCH_QCOM
 	select COMMON_CLK
 	select COMMON_CLK_QCOM
 	select QCOM_GDSC
 	help
-	  This enables support for the MSMTRITON chipset.
+	  This enables support for the SDM630 chipset.
 	  If you do not wish to build a kernel that runs
 	  on this chipset,say 'N' here.
 

arch/arm64/configs/sdm660-perf_defconfig

@@ -47,7 +47,7 @@ CONFIG_MODULE_SIG_SHA512=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_SDM660=y
-CONFIG_ARCH_MSMTRITON=y
+CONFIG_ARCH_SDM630=y
 CONFIG_PCI=y
 CONFIG_PCI_MSM=y
 CONFIG_SCHED_MC=y

arch/arm64/configs/sdm660_defconfig

@@ -48,7 +48,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_SDM660=y
-CONFIG_ARCH_MSMTRITON=y
+CONFIG_ARCH_SDM630=y
 CONFIG_PCI=y
 CONFIG_PCI_MSM=y
 CONFIG_SCHED_MC=y

drivers/clk/qcom/gpucc-sdm660.c

@@ -187,7 +187,7 @@ static const struct freq_tbl ftbl_gfx3d_clk_src[] = {
 	{ }
 };
 
-static const struct freq_tbl ftbl_gfx3d_clk_src_triton[] = {
+static const struct freq_tbl ftbl_gfx3d_clk_src_630[] = {
 	F_GFX( 19200000, 0,  1, 0, 0,         0),
 	F_GFX(160000000, 0,  2, 0, 0,  640000000),
 	F_GFX(240000000, 0,  2, 0, 0,  480000000),
@@ -344,7 +344,7 @@ static const struct qcom_cc_desc gpucc_660_desc = {
 
 static const struct of_device_id gpucc_660_match_table[] = {
 	{ .compatible = "qcom,gpucc-sdm660" },
-	{ .compatible = "qcom,gpucc-msmtriton" },
+	{ .compatible = "qcom,gpucc-sdm630" },
 	{ }
 };
 MODULE_DEVICE_TABLE(of, gpucc_660_match_table);
@@ -411,7 +411,7 @@ static int gpucc_660_probe(struct platform_device *pdev)
 {
 	int ret = 0;
 	struct regmap *regmap;
-	bool is_triton = 0;
+	bool is_630 = 0;
 
 	regmap = qcom_cc_map(pdev, &gpucc_660_desc);
 	if (IS_ERR(regmap))
@@ -444,15 +444,15 @@ static int gpucc_660_probe(struct platform_device *pdev)
 		return PTR_ERR(vdd_gfx.regulator[0]);
 	}
 
-	is_triton = of_device_is_compatible(pdev->dev.of_node,
-					"qcom,gpucc-msmtriton");
-	if (is_triton) {
+	is_630 = of_device_is_compatible(pdev->dev.of_node,
+					"qcom,gpucc-sdm630");
+	if (is_630) {
 		gpu_pll0_pll_out_main.clkr.hw.init->rate_max[VDD_DIG_LOW_L1]
 						= 1550000000;
 		gpu_pll1_pll_out_main.clkr.hw.init->rate_max[VDD_DIG_LOW_L1]
 						= 1550000000;
 		/* Add new frequency table */
-		gfx3d_clk_src.freq_tbl = ftbl_gfx3d_clk_src_triton;
+		gfx3d_clk_src.freq_tbl = ftbl_gfx3d_clk_src_630;
 	}
 
 	/* GFX rail fmax data linked to branch clock */

drivers/crypto/Kconfig

@@ -372,18 +372,18 @@ config CRYPTO_DEV_QCRYPTO
 
 config CRYPTO_DEV_QCOM_MSM_QCE
         tristate "Qualcomm Crypto Engine (QCE) module"
-        select  CRYPTO_DEV_QCE50 if ARCH_APQ8084 || ARCH_MSM8916 || ARCH_MSM8994 || ARCH_MSM8996 || ARCH_MSM8992 || ARCH_MSMTITANIUM || ARCH_MSM8909 || ARCH_MSM8998 || ARCH_SDM660 || ARCH_MSMTRITON
+        select  CRYPTO_DEV_QCE50 if ARCH_APQ8084 || ARCH_MSM8916 || ARCH_MSM8994 || ARCH_MSM8996 || ARCH_MSM8992 || ARCH_MSMTITANIUM || ARCH_MSM8909 || ARCH_MSM8998 || ARCH_SDM660 || ARCH_SDM630
         default n
         help
           This driver supports Qualcomm Crypto Engine in MSM7x30, MSM8660
           MSM8x55, MSM8960, MSM9615, MSM8916, MSM8994, MSM8996, FSM9900,
-		  MSMTITANINUM, APQ8084, MSM8998, SDM660 and MSMTRITON.
+		  MSMTITANINUM, APQ8084, MSM8998, SDM660 and SDM630.
 
           To compile this driver as a module, choose M here: the
           For MSM7x30 MSM8660 and MSM8x55 the module is called qce
           For MSM8960, APQ8064 and MSM9615 the module is called qce40
           For MSM8974, MSM8916, MSM8994, MSM8996, MSM8992, MSMTITANIUM,
-		  APQ8084, MSM8998, SDM660 and MSMTRITON the module is called qce50.
+		  APQ8084, MSM8998, SDM660 and SDM630 the module is called qce50.
 
 config CRYPTO_DEV_QCEDEV
         tristate "QCEDEV Interface to CE module"
@@ -391,7 +391,7 @@ config CRYPTO_DEV_QCEDEV
         help
           This driver supports Qualcomm QCEDEV Crypto in MSM7x30, MSM8660,
           MSM8960, MSM9615, APQ8064, MSM8974, MSM8916, MSM8994, MSM8996,
-          APQ8084, MSM8998, SDM660, MSMTRITON. This exposes the
+          APQ8084, MSM8998, SDM660, SDM630. This exposes the
           interface to the QCE hardware accelerator via IOCTLs.
 
           To compile this driver as a module, choose M here: the

drivers/soc/qcom/socinfo.c

@@ -539,8 +539,8 @@ static struct msm_soc_info cpu_of_id[] = {
 	[317] = {MSM_CPU_660, "SDM660"},
 	[324] = {MSM_CPU_660, "SDA660"},
 
-	/* triton ID */
-	[318] = {MSM_CPU_TRITON, "MSMTRITON"},
+	/* 630 ID */
+	[318] = {MSM_CPU_630, "SDM630"},
 
 	/* Uninitialized IDs are not known to run Linux.
 	   MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are
@@ -1216,9 +1216,9 @@ static void * __init setup_dummy_socinfo(void)
 		dummy_socinfo.id = 324;
 		strlcpy(dummy_socinfo.build_id, "sda660 - ",
 			sizeof(dummy_socinfo.build_id));
-	} else if (early_machine_is_msmtriton()) {
+	} else if (early_machine_is_sdm630()) {
 		dummy_socinfo.id = 318;
-		strlcpy(dummy_socinfo.build_id, "msmtriton - ",
+		strlcpy(dummy_socinfo.build_id, "sdm630 - ",
 			sizeof(dummy_socinfo.build_id));
 	} else if (early_machine_is_apq8998()) {
 		dummy_socinfo.id = 319;

drivers/thermal/msm-tsens.c

@@ -940,7 +940,7 @@ static struct of_device_id tsens_match[] = {
 	{	.compatible = "qcom,sdm660-tsens",
 		.data = (void *)TSENS_CALIB_FUSE_MAP_NONE,
 	},
-	{	.compatible = "qcom,msmtriton-tsens",
+	{	.compatible = "qcom,sdm630-tsens",
 		.data = (void *)TSENS_CALIB_FUSE_MAP_NONE,
 	},
 	{}
@@ -5508,7 +5508,7 @@ static int get_device_tree_data(struct platform_device *pdev,
 		tmdev->tsens_type = TSENS_TYPE3;
 	else if (!strcmp(id->compatible, "qcom,msmtitanium-tsens") ||
 		(!strcmp(id->compatible, "qcom,sdm660-tsens") ||
-		(!strcmp(id->compatible, "qcom,msmtriton-tsens") ||
+		(!strcmp(id->compatible, "qcom,sdm630-tsens") ||
 		(!strcmp(id->compatible, "qcom,msmhamster-tsens"))))) {
 		tmdev->tsens_type = TSENS_TYPE3;
 		tsens_poll_check = 0;
@@ -5531,7 +5531,7 @@ static int get_device_tree_data(struct platform_device *pdev,
 		(!strcmp(id->compatible, "qcom,msmtitanium-tsens")) ||
 		(!strcmp(id->compatible, "qcom,msm8998-tsens")) ||
 		(!strcmp(id->compatible, "qcom,sdm660-tsens") ||
-		(!strcmp(id->compatible, "qcom,msmtriton-tsens") ||
+		(!strcmp(id->compatible, "qcom,sdm630-tsens") ||
 		(!strcmp(id->compatible, "qcom,msmhamster-tsens")))))
 			tmdev->tsens_valid_status_check = true;
 	}
@@ -5548,7 +5548,7 @@ static int get_device_tree_data(struct platform_device *pdev,
 		(!strcmp(id->compatible, "qcom,msm8998-tsens")) ||
 		(!strcmp(id->compatible, "qcom,msmhamster-tsens")) ||
 		(!strcmp(id->compatible, "qcom,sdm660-tsens") ||
-		(!strcmp(id->compatible, "qcom,msmtriton-tsens") ||
+		(!strcmp(id->compatible, "qcom,sdm630-tsens") ||
 		(!strcmp(id->compatible, "qcom,msmtitanium-tsens"))))) {
 		tmdev->tsens_critical_irq =
 				platform_get_irq_byname(pdev,

include/soc/qcom/socinfo.h

@@ -98,8 +98,8 @@
 	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_msmtriton()	\
-	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmtriton")
+#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
@@ -138,7 +138,7 @@
 #define early_machine_is_msmhamster()	0
 #define early_machine_is_sdm660()	0
 #define early_machine_is_sda660()	0
-#define early_machine_is_msmtriton()	0
+#define early_machine_is_sdm630()	0
 #endif
 
 #define PLATFORM_SUBTYPE_MDM	1
@@ -198,7 +198,7 @@ enum msm_cpu {
 	MSM_CPU_8998,
 	MSM_CPU_HAMSTER,
 	MSM_CPU_660,
-	MSM_CPU_TRITON,
+	MSM_CPU_630,
 };
 
 struct msm_soc_info {