Merge "mdm9630: rename msmkrypton to mdm9630"

Documentation/devicetree/bindings/arm/msm/acpuclock/clock-a7.txt

@@ -6,7 +6,7 @@ a configurable divider. This hw is different than normal rcgs in that it may
 optionally have a register which encodes the maximum rate supported by hw.
 
 Required properties:
-- compatible: "qcom,clock-a7-8226", "qcom,clock-a7-krypton"
+- compatible: "qcom,clock-a7-8226", "qcom,clock-a7-9630"
 - reg: pairs of physical address and region size
 - reg-names: "rcg-base" is expected
 - clock-names: list of names of clock inputs

Documentation/devicetree/bindings/thermal/tsens.txt

@@ -16,7 +16,7 @@ Required properties:
 	       should be "qcom,msm8x10-tsens" for 8x10 TSENS driver.
 	       should be "qcom,msm8x26-tsens" for 8x26 TSENS driver.
 	       should be "qcom,fsm9900-tsens" for 9900 TSENS driver.
-	       should be "qcom,msmkrypton-tsens" for krypton TSENS driver.
+	       should be "qcom,mdm9630-tsens" for 9630 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.

arch/arm/boot/dts/qcom/Makefile

@@ -71,9 +71,9 @@ dtb-$(CONFIG_ARCH_FSM9900) += fsm9900-rumi.dtb \
 	fsm9900-sim.dtb \
 	fsm9900-cdp.dtb \
 	fsm9900-mtp.dtb
-dtb-$(CONFIG_ARCH_MSMKRYPTON) += msmkrypton-sim.dtb \
-	msmkrypton-cdp.dtb \
-	msmkrypton-mtp.dtb
+dtb-$(CONFIG_ARCH_MDM9630) += mdm9630-sim.dtb \
+	mdm9630-cdp.dtb \
+	mdm9630-mtp.dtb
 dtb-$(CONFIG_ARCH_MSMSAMARIUM) += msmsamarium-sim.dtb \
 	msmsamarium-rumi.dtb \
 	msmsamarium-cdp-interposer.dtb \

arch/arm/boot/dts/qcom/mdm9630-cdp.dts

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, 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 "msmkrypton.dtsi"
-#include "msmkrypton-cdp.dtsi"
+#include "mdm9630.dtsi"
+#include "mdm9630-cdp.dtsi"
 
 / {
-	model = "Qualcomm MSM KRYPTON CDP";
-	compatible = "qcom,msmkrypton-cdp", "qcom,msmkrypton", "qcom,cdp";
+	model = "Qualcomm MDM 9630 CDP";
+	compatible = "qcom,mdm9630-cdp", "qcom,mdm9630", "qcom,cdp";
 	qcom,board-id = <1 0>;
 };

arch/arm/boot/dts/qcom/mdm9630-mtp.dts

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, 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 "msmkrypton.dtsi"
-#include "msmkrypton-mtp.dtsi"
+#include "mdm9630.dtsi"
+#include "mdm9630-mtp.dtsi"
 
 / {
-	model = "Qualcomm MSM KRYPTON MTP";
-	compatible = "qcom,msmkrypton-mtp", "qcom,msmkrypton", "qcom,mtp";
+	model = "Qualcomm MDM 9630 MTP";
+	compatible = "qcom,mdm9630-mtp", "qcom,mdm9630", "qcom,mtp";
 	qcom,board-id = <7 0>;
 };

arch/arm/boot/dts/qcom/mdm9630-sim.dts

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, 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 "msmkrypton.dtsi"
+#include "mdm9630.dtsi"
 
 / {
-	model = "Qualcomm MSM KRYPTON SIM";
-	compatible = "qcom,msmkrypton-sim", "qcom,msmkrypton", "qcom,sim";
+	model = "Qualcomm MDM 9630 SIM";
+	compatible = "qcom,mdm9630-sim", "qcom,mdm9630", "qcom,sim";
 	qcom,board-id = <16 0>;
 };
 

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

@@ -13,8 +13,8 @@
 #include "skeleton.dtsi"
 
 / {
-	model = "Qualcomm MSM KRYPTON";
-	compatible = "qcom,msmkrypton";
+	model = "Qualcomm MDM 9630";
+	compatible = "qcom,mdm9630";
 	qcom,msm-id = <187 0x10000>, <227 0x10000>, <228 0x10000>,
 		      <229 0x10000>, <230 0x10000>, <231 0x10000>;
 	interrupt-parent = <&intc>;
@@ -36,12 +36,12 @@
 	soc: soc { };
 };
 
-#include "msmkrypton-smp2p.dtsi"
-#include "msmkrypton-coresight.dtsi"
+#include "mdm9630-smp2p.dtsi"
+#include "mdm9630-coresight.dtsi"
 #include "msm-gdsc.dtsi"
-#include "msmkrypton-pm.dtsi"
-#include "msmkrypton-bus.dtsi"
-#include "msmkrypton-ion.dtsi"
+#include "mdm9630-pm.dtsi"
+#include "mdm9630-bus.dtsi"
+#include "mdm9630-ion.dtsi"
 
 &soc {
 	#address-cells = <1>;
@@ -691,7 +691,7 @@
 	};
 
 	tsens: tsens@fc4a8000 {
-		compatible = "qcom,msmkrypton-tsens";
+		compatible = "qcom,mdm9630-tsens";
 		reg = <0xfc4a8000 0x2000>,
 		      <0xfc4bc000 0x1000>;
 		reg-names = "tsens_physical", "tsens_eeprom_physical";
@@ -701,7 +701,7 @@
 	};
 
 	qcom,clock-a7@f9010008 {
-		compatible = "qcom,clock-a7-krypton";
+		compatible = "qcom,clock-a7-9630";
 		reg = <0xf9010008 0x8>;
 		reg-names = "rcg-base";
 
@@ -796,7 +796,7 @@
 
 #include "msm-pmd9635-rpm-regulator.dtsi"
 #include "msm-pmd9635.dtsi"
-#include "msmkrypton-regulator.dtsi"
+#include "mdm9630-regulator.dtsi"
 
 &pmd9635_vadc {
 	chan@31 {

arch/arm/configs/mdm9630_defconfig

@@ -31,7 +31,7 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_MSM=y
-CONFIG_ARCH_MSMKRYPTON=y
+CONFIG_ARCH_MDM9630=y
 # CONFIG_MSM_STACKED_MEMORY is not set
 CONFIG_CPU_HAS_L2_PMU=y
 CONFIG_MSM_SMD=y

arch/arm/mach-msm/Kconfig

@@ -126,8 +126,8 @@ config ARCH_FSM9900
 	select MIGHT_HAVE_PCI
 	select MSM_IRQ
 
-config ARCH_MSMKRYPTON
-	bool "MSMKRYPTON"
+config ARCH_MDM9630
+	bool "MDM9630"
 	select ARM_GIC
 	select MSM_SCM
 	select CPU_V7
@@ -367,7 +367,7 @@ config PHYS_OFFSET
 	default "0x00000000" if ARCH_MSM8610
 	default "0x00000000" if ARCH_MSMSAMARIUM
 	default "0x40000000" if ARCH_FSM9900
-	default "0x00000000" if ARCH_MSMKRYPTON
+	default "0x00000000" if ARCH_MDM9630
 	default "0x00200000" if !MSM_STACKED_MEMORY
 	default "0x10000000"
 

arch/arm/mach-msm/Makefile

@@ -97,7 +97,7 @@ obj-$(CONFIG_ARCH_MSM8974) += board-8974.o board-8974-gpiomux.o
 obj-$(CONFIG_ARCH_MSM8974) += clock-krait-8974.o
 obj-$(CONFIG_ARCH_MSM8974) += clock-local2.o clock-pll.o clock-rpm-8974.o clock-gcc-8974.o clock-mmss-8974.o clock-lpass-8974.o clock-rpm.o clock-voter.o clock-mdss-8974.o
 obj-$(CONFIG_KRAIT_REGULATOR) += krait-regulator.o  krait-regulator-pmic.o
-obj-$(CONFIG_ARCH_MSMKRYPTON) += board-krypton.o board-krypton-gpiomux.o
+obj-$(CONFIG_ARCH_MDM9630) += board-9630.o board-9630-gpiomux.o
 obj-$(CONFIG_ARCH_MSMSAMARIUM) += board-samarium.o board-samarium-gpiomux.o
 obj-$(CONFIG_ARCH_MSMSAMARIUM) += clock-local2.o clock-pll.o clock-rpm.o clock-samarium.o clock-krait-8974.o clock-mdss-8974.o
 obj-$(CONFIG_ARCH_MPQ8092) += board-8092.o board-8092-gpiomux.o
@@ -107,8 +107,8 @@ obj-$(CONFIG_ARCH_MSM8226) += clock-local2.o clock-pll.o clock-8226.o clock-rpm.
 obj-$(CONFIG_ARCH_MSM8610) += board-8610.o board-8610-gpiomux.o
 obj-$(CONFIG_ARCH_MSM8610) += clock-local2.o clock-pll.o clock-8610.o clock-rpm.o clock-voter.o
 obj-$(CONFIG_ARCH_MSM8610) += clock-dsi-8610.o
-obj-$(CONFIG_ARCH_MSMKRYPTON) += clock-local2.o clock-pll.o clock-krypton.o clock-rpm.o clock-voter.o
-obj-$(CONFIG_ARCH_MSMKRYPTON) += clock-alpha-pll.o
+obj-$(CONFIG_ARCH_MDM9630) += clock-local2.o clock-pll.o clock-9630.o clock-rpm.o clock-voter.o
+obj-$(CONFIG_ARCH_MDM9630) += clock-alpha-pll.o
 
 obj-$(CONFIG_MSM_PM8X60) += pm-8x60.o pm-data.o
 
@@ -135,7 +135,7 @@ obj-$(CONFIG_MSM_OCMEM) += ocmem_sched.o ocmem_api.o ocmem_rdm.o ocmem_core.o
 obj-$(CONFIG_SENSORS_ADSP) += sensors_adsp.o
 
 obj-$(CONFIG_ARCH_MSM8974) += gpiomux-v2.o gpiomux.o
-obj-$(CONFIG_ARCH_MSMKRYPTON) += gpiomux-v2.o gpiomux.o
+obj-$(CONFIG_ARCH_MDM9630) += gpiomux-v2.o gpiomux.o
 obj-$(CONFIG_ARCH_MSMSAMARIUM) += gpiomux-v2.o gpiomux.o
 obj-$(CONFIG_ARCH_MPQ8092) += gpiomux-v2.o gpiomux.o
 obj-$(CONFIG_ARCH_MSM8226) += gpiomux-v2.o gpiomux.o

arch/arm/mach-msm/Makefile.boot

@@ -4,8 +4,8 @@
 # APQ8084
    zreladdr-$(CONFIG_ARCH_APQ8084)	:= 0x00008000
 
-# MSMKRYPTON
-   zreladdr-$(CONFIG_ARCH_MSMKRYPTON)	:= 0x00008000
+# MDM9630
+   zreladdr-$(CONFIG_ARCH_MDM9630)	:= 0x00008000
 
 # MSM8226
    zreladdr-$(CONFIG_ARCH_MSM8226)	:= 0x00008000

arch/arm/mach-msm/board-9630-gpiomux.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, 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
@@ -163,7 +163,7 @@ static struct msm_gpiomux_config msm_wlan_configs[] __initdata = {
 	},
 };
 
-void __init msmkrypton_init_gpiomux(void)
+void __init mdm9630_init_gpiomux(void)
 {
 	int rc;
 

arch/arm/mach-msm/board-9630.c

@@ -35,7 +35,7 @@
 #include "clock.h"
 #include "spm.h"
 
-static struct of_dev_auxdata msmkrypton_auxdata_lookup[] __initdata = {
+static struct of_dev_auxdata mdm9630_auxdata_lookup[] __initdata = {
 	OF_DEV_AUXDATA("qcom,sdhci-msm", 0xF98A4900, "msm_sdcc.2", NULL),
 	OF_DEV_AUXDATA("qcom,msm_pcie", 0xFC520000, "msm_pcie", NULL),
 	{}
@@ -47,58 +47,58 @@ static struct of_dev_auxdata msmkrypton_auxdata_lookup[] __initdata = {
  * into this category, and thus the driver should not be added here. The
  * EPROBE_DEFER can satisfy most dependency problems.
  */
-void __init msmkrypton_add_drivers(void)
+void __init mdm9630_add_drivers(void)
 {
 	msm_smd_init();
 	msm_rpm_driver_init();
 	rpm_smd_regulator_driver_init();
 	msm_spm_device_init();
-	msm_clock_init(&msmkrypton_clock_init_data);
+	msm_clock_init(&mdm9630_clock_init_data);
 	tsens_tm_init_driver();
 	msm_thermal_device_init();
 }
 
-void __init msmkrypton_reserve(void)
+void __init mdm9630_reserve(void)
 {
 	of_scan_flat_dt(dt_scan_for_memory_reserve, NULL);
 }
-static void __init msmkrypton_early_memory(void)
+static void __init mdm9630_early_memory(void)
 {
 	of_scan_flat_dt(dt_scan_for_memory_hole, NULL);
 }
-static void __init msmkrypton_map_io(void)
+static void __init mdm9630_map_io(void)
 {
-	msm_map_msmkrypton_io();
+	msm_map_mdm9630_io();
 }
 
-void __init msmkrypton_init(void)
+void __init mdm9630_init(void)
 {
 	/*
 	 * populate devices from DT first so smem probe will get called as part
 	 * of msm_smem_init.  socinfo_init needs smem support so call
 	 * msm_smem_init before it.
 	 */
-	board_dt_populate(msmkrypton_auxdata_lookup);
+	board_dt_populate(mdm9630_auxdata_lookup);
 
 	msm_smem_init();
 
 	if (socinfo_init() < 0)
 		pr_err("%s: socinfo_init() failed\n", __func__);
 
-	msmkrypton_init_gpiomux();
-	msmkrypton_add_drivers();
+	mdm9630_init_gpiomux();
+	mdm9630_add_drivers();
 }
 
-static const char *msmkrypton_dt_match[] __initconst = {
-	"qcom,msmkrypton",
+static const char *mdm9630_dt_match[] __initconst = {
+	"qcom,mdm9630",
 	NULL
 };
 
-DT_MACHINE_START(MSMKRYPTON_DT, "Qualcomm MSM Krypton (Flattened Device Tree)")
-	.map_io			= msmkrypton_map_io,
-	.init_machine		= msmkrypton_init,
-	.dt_compat		= msmkrypton_dt_match,
-	.reserve		= msmkrypton_reserve,
-	.init_very_early	= msmkrypton_early_memory,
+DT_MACHINE_START(MDM9630_DT, "Qualcomm MDM 9630 (Flattened Device Tree)")
+	.map_io			= mdm9630_map_io,
+	.init_machine		= mdm9630_init,
+	.dt_compat		= mdm9630_dt_match,
+	.reserve		= mdm9630_reserve,
+	.init_very_early	= mdm9630_early_memory,
 	.restart		= msm_restart,
 MACHINE_END

arch/arm/mach-msm/clock-9630.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, 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
@@ -1929,7 +1929,7 @@ static struct measure_clk measure_clk = {
 	.multiplier = 1,
 };
 
-static struct clk_lookup msm_clocks_krypton[] = {
+static struct clk_lookup msm_clocks_9630[] = {
 	CLK_LOOKUP("xo",	xo.c,	""),
 	CLK_LOOKUP("measure",	measure_clk.c,	"debug"),
 
@@ -2207,7 +2207,7 @@ static void __init reg_init(void)
 	writel_relaxed(regval, GCC_REG_BASE(APCS_CLOCK_BRANCH_ENA_VOTE));
 }
 
-static void __init msmkrypton_clock_post_init(void)
+static void __init mdm9630_clock_post_init(void)
 {
 	/*
 	 * Hold an active set vote for CXO; this is because CXO is expected
@@ -2237,11 +2237,11 @@ static void __init msmkrypton_clock_post_init(void)
 #define APCS_ACC_PHYS		0xF9008018
 #define APCS_ACC_SIZE		0x28
 
-static void __init msmkrypton_clock_pre_init(void)
+static void __init mdm9630_clock_pre_init(void)
 {
 	virt_bases[GCC_BASE] = ioremap(GCC_CC_PHYS, GCC_CC_SIZE);
 	if (!virt_bases[GCC_BASE])
-		panic("clock-krypton: Unable to ioremap GCC memory!");
+		panic("clock-9630: Unable to ioremap GCC memory!");
 
 	virt_bases[LPASS_BASE] = ioremap(LPASS_CC_PHYS, LPASS_CC_SIZE);
 	if (!virt_bases[LPASS_BASE])
@@ -2249,32 +2249,32 @@ static void __init msmkrypton_clock_pre_init(void)
 
 	virt_bases[APCS_GLB_BASE] = ioremap(APCS_GLB_PHYS, APCS_GLB_SIZE);
 	if (!virt_bases[APCS_GLB_BASE])
-		panic("clock-krypton: Unable to ioremap APCS_GLB memory!");
+		panic("clock-9630: Unable to ioremap APCS_GLB memory!");
 
 	virt_bases[APCS_GCC_BASE] = ioremap(APCS_GCC_PHYS, APCS_GCC_SIZE);
 	if (!virt_bases[APCS_GCC_BASE])
-		panic("clock-krypton: Unable to ioremap APCS_GCC memory!");
+		panic("clock-9630: Unable to ioremap APCS_GCC memory!");
 
 	virt_bases[APCS_ACC_BASE] = ioremap(APCS_ACC_PHYS, APCS_ACC_SIZE);
 	if (!virt_bases[APCS_ACC_BASE])
-		panic("clock-krypton: Unable to ioremap APCS_PLL memory!");
+		panic("clock-9630: Unable to ioremap APCS_PLL memory!");
 
 	vdd_dig.regulator[0] = regulator_get(NULL, "vdd_dig");
 	if (IS_ERR(vdd_dig.regulator[0]))
-		panic("clock-krypton: Unable to get the vdd_dig regulator!");
+		panic("clock-9630: Unable to get the vdd_dig regulator!");
 
 	vdd_dig_ao.regulator[0] = regulator_get(NULL, "vdd_dig_ao");
 	if (IS_ERR(vdd_dig_ao.regulator[0]))
-		panic("clock-krypton: Unable to get the vdd_dig_ao regulator!");
+		panic("clock-9630: Unable to get the vdd_dig_ao regulator!");
 
 	enable_rpm_scaling();
 
 	reg_init();
 }
 
-struct clock_init_data msmkrypton_clock_init_data __initdata = {
-	.table = msm_clocks_krypton,
-	.size = ARRAY_SIZE(msm_clocks_krypton),
-	.pre_init = msmkrypton_clock_pre_init,
-	.post_init = msmkrypton_clock_post_init,
+struct clock_init_data mdm9630_clock_init_data __initdata = {
+	.table = msm_clocks_9630,
+	.size = ARRAY_SIZE(msm_clocks_9630),
+	.pre_init = mdm9630_clock_pre_init,
+	.post_init = mdm9630_clock_post_init,
 };

arch/arm/mach-msm/clock-a7.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2014, 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
@@ -370,7 +370,7 @@ static int clock_a7_probe(struct platform_device *pdev)
 
 static struct of_device_id clock_a7_match_table[] = {
 	{.compatible = "qcom,clock-a7-8226"},
-	{.compatible = "qcom,clock-a7-krypton"},
+	{.compatible = "qcom,clock-a7-9630"},
 	{}
 };
 

arch/arm/mach-msm/clock.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -56,7 +56,7 @@ extern struct clock_init_data apq8084_clock_init_data;
 extern struct clock_init_data apq8084_rumi_clock_init_data;
 extern struct clock_init_data mpq8092_clock_init_data;
 extern struct clock_init_data mpq8092_rumi_clock_init_data;
-extern struct clock_init_data msmkrypton_clock_init_data;
+extern struct clock_init_data mdm9630_clock_init_data;
 extern struct clock_init_data msmsamarium_clock_init_data;
 extern struct clock_init_data msmsamarium_rumi_clock_init_data;
 extern struct clock_init_data fsm9900_clock_init_data;

arch/arm/mach-msm/include/mach/board.h

@@ -1,7 +1,7 @@
 /* arch/arm/mach-msm/include/mach/board.h
  *
  * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2008-2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2008-2014, The Linux Foundation. All rights reserved.
  * Author: Brian Swetland <swetland@google.com>
  *
  * This software is licensed under the terms of the GNU General Public
@@ -624,7 +624,7 @@ void fsm9900_init_gpiomux(void);
 void fsm9900_rf_init_gpiomux(void);
 void msm_map_8974_io(void);
 void msm_map_8084_io(void);
-void msm_map_msmkrypton_io(void);
+void msm_map_mdm9630_io(void);
 void msm_map_msmsamarium_io(void);
 void msm_map_msm8625_io(void);
 void msm_map_msm9625_io(void);
@@ -636,7 +636,7 @@ void msm_8974_very_early(void);
 void msm_8974_init_gpiomux(void);
 void apq8084_init_gpiomux(void);
 void msm9625_init_gpiomux(void);
-void msmkrypton_init_gpiomux(void);
+void mdm9630_init_gpiomux(void);
 void msmsamarium_init_gpiomux(void);
 void msm_map_mpq8092_io(void);
 void mpq8092_init_gpiomux(void);

arch/arm/mach-msm/include/mach/msm_iomap-9630.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -11,8 +11,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef __ASM_ARCH_MSM_IOMAP_MSMKRYPTON_H
-#define __ASM_ARCH_MSM_IOMAP_MSMKRYPTON_H
+#ifndef __ASM_ARCH_MSM_IOMAP_MDM9630_H
+#define __ASM_ARCH_MSM_IOMAP_MDM9630_H
 
 /* Physical base address and size of peripherals.
  * Ordered by the virtual base addresses they will be mapped at.
@@ -23,12 +23,12 @@
  *
  */
 
-#define MSMKRYPTON_SHARED_RAM_PHYS		0x01100000
+#define MDM9630_SHARED_RAM_PHYS		0x01100000
 
-#define MSMKRYPTON_TLMM_PHYS			0xFD510000
-#define MSMKRYPTON_TLMM_SIZE			SZ_16K
+#define MDM9630_TLMM_PHYS			0xFD510000
+#define MDM9630_TLMM_SIZE			SZ_16K
 
-#define MSMKRYPTON_MPM2_PSHOLD_PHYS		0xFC4AB000
-#define MSMKRYPTON_MPM2_PSHOLD_SIZE		SZ_4K
+#define MDM9630_MPM2_PSHOLD_PHYS		0xFC4AB000
+#define MDM9630_MPM2_PSHOLD_SIZE		SZ_4K
 
 #endif

arch/arm/mach-msm/include/mach/msm_iomap.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2008-2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2008-2014, The Linux Foundation. All rights reserved.
  * Author: Brian Swetland <swetland@google.com>
  *
  * This software is licensed under the terms of the GNU General Public
@@ -93,7 +93,7 @@
 #include "msm_iomap-8092.h"
 #include "msm_iomap-8226.h"
 #include "msm_iomap-8610.h"
-#include "msm_iomap-krypton.h"
+#include "msm_iomap-9630.h"
 #include "msm_iomap-fsm9900.h"
 #include "msm_iomap-samarium.h"
 

arch/arm/mach-msm/include/mach/socinfo.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2009-2014, 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
@@ -58,8 +58,8 @@
 	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,mpq8092")
 #define early_machine_is_apq8084()	\
 	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,apq8084")
-#define early_machine_is_msmkrypton()	\
-	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmkrypton")
+#define early_machine_is_mdm9630()	\
+	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,mdm9630")
 #define early_machine_is_fsm9900()	\
 	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,fsm9900")
 #define early_machine_is_msmsamarium()	\
@@ -87,7 +87,7 @@
 #define early_machine_is_msm8610()	0
 #define early_machine_is_mpq8092()	0
 #define early_machine_is_apq8084()	0
-#define early_machine_is_msmkrypton()	0
+#define early_machine_is_mdm9630()	0
 #define early_machine_is_fsm9900()	0
 #define early_machine_is_msmsamarium()	0
 #endif
@@ -133,7 +133,7 @@ enum msm_cpu {
 	MSM_CPU_8610,
 	MSM_CPU_8625Q,
 	MSM_CPU_8084,
-	MSM_CPU_KRYPTON,
+	MSM_CPU_9630,
 	FSM_CPU_9900,
 	MSM_CPU_SAMARIUM,
 };

arch/arm/mach-msm/io.c

@@ -3,7 +3,7 @@
  * MSM7K, QSD io support
  *
  * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2008-2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2008-2014, The Linux Foundation. All rights reserved.
  * Author: Brian Swetland <swetland@google.com>
  *
  * This software is licensed under the terms of the GNU General Public
@@ -91,17 +91,17 @@ void __init msm_map_fsm9900_io(void)
 }
 #endif /* CONFIG_ARCH_FSM9900 */
 
-#ifdef CONFIG_ARCH_MSMKRYPTON
-static struct map_desc msmkrypton_io_desc[] __initdata = {
-	MSM_CHIP_DEVICE(TLMM, MSMKRYPTON),
-	MSM_CHIP_DEVICE(MPM2_PSHOLD, MSMKRYPTON),
+#ifdef CONFIG_ARCH_MDM9630
+static struct map_desc mdm9630_io_desc[] __initdata = {
+	MSM_CHIP_DEVICE(TLMM, MDM9630),
+	MSM_CHIP_DEVICE(MPM2_PSHOLD, MDM9630),
 };
 
-void __init msm_map_msmkrypton_io(void)
+void __init msm_map_mdm9630_io(void)
 {
-	iotable_init(msmkrypton_io_desc, ARRAY_SIZE(msmkrypton_io_desc));
+	iotable_init(mdm9630_io_desc, ARRAY_SIZE(mdm9630_io_desc));
 }
-#endif /* CONFIG_ARCH_MSMKRYPTON */
+#endif /* CONFIG_ARCH_MDM9630 */
 
 #ifdef CONFIG_ARCH_MPQ8092
 static struct map_desc mpq8092_io_desc[] __initdata = {

arch/arm/mach-msm/pcie_phy.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, 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
@@ -25,7 +25,7 @@ static inline void write_phy(void *base, u32 offset, u32 value)
 	wmb();
 }
 
-#ifdef CONFIG_ARCH_MSMKRYPTON
+#ifdef CONFIG_ARCH_MDM9630
 void pcie_phy_init(struct msm_pcie_dev_t *dev)
 {
 

arch/arm/mach-msm/pcie_phy.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, 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 @@
 #ifndef __ARCH_ARM_MACH_MSM_PCIE_PHY_H
 #define __ARCH_ARM_MACH_MSM_PCIE_PHY_H
 
-#ifdef CONFIG_ARCH_MSMKRYPTON
+#ifdef CONFIG_ARCH_MDM9630
 #define QSERDES_COM_SYS_CLK_CTRL	0x000
 #define QSERDES_COM_PLL_VCOTAIL_EN	0x004
 #define QSERDES_COM_CMN_MODE	0x008

arch/arm/mach-msm/socinfo.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2009-2014, 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
@@ -421,13 +421,13 @@ static enum msm_cpu cpu_of_id[] = {
 	/* 8084 IDs */
 	[178] = MSM_CPU_8084,
 
-	/* krypton IDs */
-	[187] = MSM_CPU_KRYPTON,
-	[227] = MSM_CPU_KRYPTON,
-	[228] = MSM_CPU_KRYPTON,
-	[229] = MSM_CPU_KRYPTON,
-	[230] = MSM_CPU_KRYPTON,
-	[231] = MSM_CPU_KRYPTON,
+	/* 9630 IDs */
+	[187] = MSM_CPU_9630,
+	[227] = MSM_CPU_9630,
+	[228] = MSM_CPU_9630,
+	[229] = MSM_CPU_9630,
+	[230] = MSM_CPU_9630,
+	[231] = MSM_CPU_9630,
 
 	/* FSM9900 ID */
 	[188] = FSM_CPU_9900,
@@ -880,9 +880,9 @@ static void * __init setup_dummy_socinfo(void)
 		dummy_socinfo.id = 178;
 		strlcpy(dummy_socinfo.build_id, "apq8084 - ",
 			sizeof(dummy_socinfo.build_id));
-	} else if (early_machine_is_msmkrypton()) {
+	} else if (early_machine_is_mdm9630()) {
 		dummy_socinfo.id = 187;
-		strlcpy(dummy_socinfo.build_id, "msmkrypton - ",
+		strlcpy(dummy_socinfo.build_id, "mdm9630 - ",
 			sizeof(dummy_socinfo.build_id));
 	} else if (early_machine_is_msmsamarium()) {
 		dummy_socinfo.id = 195;

drivers/platform/msm/ipa/teth_bridge.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, 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
@@ -2738,7 +2738,7 @@ int teth_bridge_set_mbim_aggr_params(struct teth_aggr_params *aggr_params,
 	enum ipa_client_type client)
 {
 	if (ipa_ctx->ipa_hw_type != IPA_HW_v1_1)
-		TETH_ERR("This API should not be called on Krypton !\n");
+		TETH_ERR("This API should not be called on 9630 !\n");
 
 	teth_ctx->tethering_mode = TETH_TETHERING_MODE_MBIM;
 	return teth_bridge_set_aggr_params(aggr_params, client);
@@ -2757,7 +2757,7 @@ static long teth_bridge_ioctl(struct file *filp,
 	u16 i = 0;
 
 	if (teth_ctx->ipa_hw_type != IPA_HW_v1_1) {
-		IPAERR("No ioctls are supported for krypton !\n");
+		IPAERR("No ioctls are supported for 9630 !\n");
 		return -ENOIOCTLCMD;
 	}
 

drivers/thermal/msm8974-tsens.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2014, 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
@@ -303,7 +303,7 @@ enum tsens_calib_fuse_map_type {
 	TSENS_CALIB_FUSE_MAP_8X26,
 	TSENS_CALIB_FUSE_MAP_8X10,
 	TSENS_CALIB_FUSE_MAP_9900,
-	TSENS_CALIB_FUSE_MAP_KRYPTON,
+	TSENS_CALIB_FUSE_MAP_9630,
 	TSENS_CALIB_FUSE_MAP_NUM,
 };
 
@@ -822,7 +822,7 @@ static void tsens_hw_init(void)
 		TSENS_UPPER_LOWER_INTERRUPT_CTRL(tmdev->tsens_addr));
 }
 
-static int tsens_calib_krypton_sensors(void)
+static int tsens_calib_9630_sensors(void)
 {
 	int i, tsens_base0_data = 0, tsens0_point = 0, tsens1_point = 0;
 	int tsens2_point = 0, tsens3_point = 0, tsens4_point = 0;
@@ -1794,8 +1794,8 @@ static int tsens_calib_sensors(void)
 		rc = tsens_calib_8x10_sensors();
 	else if (tmdev->calib_mode == TSENS_CALIB_FUSE_MAP_9900)
 		rc = tsens_calib_9900_sensors();
-	else if (tmdev->calib_mode == TSENS_CALIB_FUSE_MAP_KRYPTON)
-		rc = tsens_calib_krypton_sensors();
+	else if (tmdev->calib_mode == TSENS_CALIB_FUSE_MAP_9630)
+		rc = tsens_calib_9630_sensors();
 	else
 		rc = -ENODEV;
 
@@ -1815,8 +1815,8 @@ static struct of_device_id tsens_match[] = {
 	{	.compatible = "qcom,fsm9900-tsens",
 		.data = (void *)TSENS_CALIB_FUSE_MAP_9900,
 	},
-	{	.compatible = "qcom,msmkrypton-tsens",
-		.data = (void *)TSENS_CALIB_FUSE_MAP_KRYPTON,
+	{	.compatible = "qcom,mdm9630-tsens",
+		.data = (void *)TSENS_CALIB_FUSE_MAP_9630,
 	},
 	{}
 };
@@ -1899,7 +1899,7 @@ static int get_device_tree_data(struct platform_device *pdev)
 		}
 	}
 
-	if (!strcmp(id->compatible, "qcom,msmkrypton-tsens"))
+	if (!strcmp(id->compatible, "qcom,mdm9630-tsens"))
 		tmdev->tsens_type = TSENS_TYPE2;
 	else
 		tmdev->tsens_type = TSENS_TYPE0;

scripts/build-all.py

@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-# Copyright (c) 2009-2013, The Linux Foundation. All rights reserved.
+# Copyright (c) 2009-2014, The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -88,7 +88,7 @@ def scan_configs():
         r'[fm]sm[0-9]*_defconfig',
         r'apq*_defconfig',
         r'qsd*_defconfig',
-	r'msmkrypton*_defconfig',
+	r'mdm*_defconfig',
 	r'mpq*_defconfig',
         )
     for p in arch_pats: