summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/devicetree/bindings/arm/msm/msm.txt5
-rw-r--r--arch/arm/boot/dts/qcom/Makefile8
-rw-r--r--arch/arm/boot/dts/qcom/sda630-cdp.dts25
-rw-r--r--arch/arm/boot/dts/qcom/sda630-mtp.dts25
-rw-r--r--arch/arm/boot/dts/qcom/sda630-pm660a-cdp.dts25
-rw-r--r--arch/arm/boot/dts/qcom/sda630-pm660a-mtp.dts25
-rw-r--r--arch/arm/boot/dts/qcom/sda630-pm660a-rcm.dts25
-rw-r--r--arch/arm/boot/dts/qcom/sda630-rcm.dts25
-rw-r--r--arch/arm/boot/dts/qcom/sda630.dtsi19
-rw-r--r--drivers/soc/qcom/socinfo.c7
-rw-r--r--include/soc/qcom/socinfo.h5
11 files changed, 191 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/arm/msm/msm.txt b/Documentation/devicetree/bindings/arm/msm/msm.txt
index cfc7acccff5e..4fadd0ccbcf7 100644
--- a/Documentation/devicetree/bindings/arm/msm/msm.txt
+++ b/Documentation/devicetree/bindings/arm/msm/msm.txt
@@ -104,6 +104,9 @@ SoCs:
- SDM630
compatible = "qcom,sdm630"
+- SDA630
+ compatible = "qcom,sda630"
+
- MSM8952
compatible = "qcom,msm8952"
@@ -284,6 +287,8 @@ compatible = "qcom,sda660-cdp"
compatible = "qcom,sdm630-rumi"
compatible = "qcom,sdm630-mtp"
compatible = "qcom,sdm630-cdp"
+compatible = "qcom,sda630-mtp"
+compatible = "qcom,sda630-cdp"
compatible = "qcom,msm8952-rumi"
compatible = "qcom,msm8952-sim"
compatible = "qcom,msm8952-qrd"
diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile
index 263217e8399d..65c42b8de30c 100644
--- a/arch/arm/boot/dts/qcom/Makefile
+++ b/arch/arm/boot/dts/qcom/Makefile
@@ -194,7 +194,13 @@ dtb-$(CONFIG_ARCH_SDM630) += sdm630-rumi.dtb \
sdm630-pm660a-rcm.dtb \
sdm630-internal-codec-pm660a-cdp.dtb \
sdm630-internal-codec-pm660a-mtp.dtb \
- sdm630-internal-codec-pm660a-rcm.dtb
+ sdm630-internal-codec-pm660a-rcm.dtb \
+ sda630-mtp.dtb \
+ sda630-cdp.dtb \
+ sda630-rcm.dtb \
+ sda630-pm660a-mtp.dtb \
+ sda630-pm660a-cdp.dtb \
+ sda630-pm660a-rcm.dtb
ifeq ($(CONFIG_ARM64),y)
always := $(dtb-y)
diff --git a/arch/arm/boot/dts/qcom/sda630-cdp.dts b/arch/arm/boot/dts/qcom/sda630-cdp.dts
new file mode 100644
index 000000000000..8db5a9e76126
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/sda630-cdp.dts
@@ -0,0 +1,25 @@
+/* Copyright (c) 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
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+
+/dts-v1/;
+
+#include "sda630.dtsi"
+#include "sdm630-cdp.dtsi"
+
+/ {
+ model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660L CDP";
+ compatible = "qcom,sda630-cdp", "qcom,sda630", "qcom,cdp";
+ qcom,board-id = <1 0>;
+ qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
+ <0x0001001b 0x0201011a 0x0 0x0>;
+};
diff --git a/arch/arm/boot/dts/qcom/sda630-mtp.dts b/arch/arm/boot/dts/qcom/sda630-mtp.dts
new file mode 100644
index 000000000000..5c4372600ad7
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/sda630-mtp.dts
@@ -0,0 +1,25 @@
+/* Copyright (c) 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
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+
+/dts-v1/;
+
+#include "sda630.dtsi"
+#include "sdm630-mtp.dtsi"
+
+/ {
+ model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660L MTP";
+ compatible = "qcom,sda630-mtp", "qcom,sda630", "qcom,mtp";
+ qcom,board-id = <8 0>;
+ qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
+ <0x0001001b 0x0201011a 0x0 0x0>;
+};
diff --git a/arch/arm/boot/dts/qcom/sda630-pm660a-cdp.dts b/arch/arm/boot/dts/qcom/sda630-pm660a-cdp.dts
new file mode 100644
index 000000000000..9afa16ff920d
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/sda630-pm660a-cdp.dts
@@ -0,0 +1,25 @@
+/* Copyright (c) 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
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+
+/dts-v1/;
+
+#include "sda630.dtsi"
+#include "sdm630-cdp.dtsi"
+#include "msm-pm660a.dtsi"
+
+/ {
+ model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660A CDP";
+ compatible = "qcom,sda630-cdp", "qcom,sda630", "qcom,cdp";
+ qcom,board-id = <1 0>;
+ qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+};
diff --git a/arch/arm/boot/dts/qcom/sda630-pm660a-mtp.dts b/arch/arm/boot/dts/qcom/sda630-pm660a-mtp.dts
new file mode 100644
index 000000000000..8bfd54e46e72
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/sda630-pm660a-mtp.dts
@@ -0,0 +1,25 @@
+/* Copyright (c) 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
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+
+/dts-v1/;
+
+#include "sda630.dtsi"
+#include "sdm630-mtp.dtsi"
+#include "msm-pm660a.dtsi"
+
+/ {
+ model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660A MTP";
+ compatible = "qcom,sda630-mtp", "qcom,sda630", "qcom,mtp";
+ qcom,board-id = <8 0>;
+ qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+};
diff --git a/arch/arm/boot/dts/qcom/sda630-pm660a-rcm.dts b/arch/arm/boot/dts/qcom/sda630-pm660a-rcm.dts
new file mode 100644
index 000000000000..04f2c3726a05
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/sda630-pm660a-rcm.dts
@@ -0,0 +1,25 @@
+/* Copyright (c) 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
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+
+/dts-v1/;
+
+#include "sda630.dtsi"
+#include "sdm630-cdp.dtsi"
+#include "msm-pm660a.dtsi"
+
+/ {
+ model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660A RCM";
+ compatible = "qcom,sda630-cdp", "qcom,sda630", "qcom,cdp";
+ qcom,board-id = <21 0>;
+ qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
+};
diff --git a/arch/arm/boot/dts/qcom/sda630-rcm.dts b/arch/arm/boot/dts/qcom/sda630-rcm.dts
new file mode 100644
index 000000000000..4a2ed2624a0d
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/sda630-rcm.dts
@@ -0,0 +1,25 @@
+/* Copyright (c) 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
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+
+/dts-v1/;
+
+#include "sda630.dtsi"
+#include "sdm630-cdp.dtsi"
+
+/ {
+ model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660L RCM";
+ compatible = "qcom,sda630-cdp", "qcom,sda630", "qcom,cdp";
+ qcom,board-id = <21 0>;
+ qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
+ <0x0001001b 0x0201011a 0x0 0x0>;
+};
diff --git a/arch/arm/boot/dts/qcom/sda630.dtsi b/arch/arm/boot/dts/qcom/sda630.dtsi
new file mode 100644
index 000000000000..87af4de959af
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/sda630.dtsi
@@ -0,0 +1,19 @@
+/* Copyright (c) 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
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include "sdm630.dtsi"
+
+/ {
+ model = "Qualcomm Technologies, Inc. SDA 630";
+ compatible = "qcom,sda630";
+ qcom,msm-id = <327 0x0>;
+};
diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c
index 43336ec83937..dd3e545eb7da 100644
--- a/drivers/soc/qcom/socinfo.c
+++ b/drivers/soc/qcom/socinfo.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009-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
@@ -543,6 +543,7 @@ static struct msm_soc_info cpu_of_id[] = {
/* 630 ID */
[318] = {MSM_CPU_630, "SDM630"},
+ [327] = {MSM_CPU_630, "SDA630"},
/* Uninitialized IDs are not known to run Linux.
MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are
@@ -1230,6 +1231,10 @@ static void * __init setup_dummy_socinfo(void)
dummy_socinfo.id = 318;
strlcpy(dummy_socinfo.build_id, "sdm630 - ",
sizeof(dummy_socinfo.build_id));
+ } else if (early_machine_is_sda630()) {
+ dummy_socinfo.id = 327;
+ strlcpy(dummy_socinfo.build_id, "sda630 - ",
+ sizeof(dummy_socinfo.build_id));
} else if (early_machine_is_apq8998()) {
dummy_socinfo.id = 319;
strlcpy(dummy_socinfo.build_id, "apq8998 - ",
diff --git a/include/soc/qcom/socinfo.h b/include/soc/qcom/socinfo.h
index 2841abe29e8d..ac36df5769ee 100644
--- a/include/soc/qcom/socinfo.h
+++ b/include/soc/qcom/socinfo.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009-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
@@ -104,6 +104,8 @@
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sda658")
#define early_machine_is_sdm630() \
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm630")
+#define early_machine_is_sda630() \
+ of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sda630")
#else
#define of_board_is_sim() 0
#define of_board_is_rumi() 0
@@ -145,6 +147,7 @@
#define early_machine_is_sdm658() 0
#define early_machine_is_sda658() 0
#define early_machine_is_sdm630() 0
+#define early_machine_is_sda630() 0
#endif
#define PLATFORM_SUBTYPE_MDM 1
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-05 23:41:17 +0000