msm: Rename msmskunk and sdmbat to sdm845 and sdm830
Rename all cases of msmskunk and sdmbat to sdm845 and sdm830
respectively.
Change-Id: Ia0c9a5ed0e4ebad696a62817c967e9baa7885f0f
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 3ed0b06..54acae6 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -2,15 +2,15 @@
dtb-$(CONFIG_ARCH_QCOM) += msm8996-mtp.dtb
dtb-$(CONFIG_ARCH_QCOM) += apq8096-db820c.dtb
-dtb-$(CONFIG_ARCH_MSMSKUNK) += msmskunk-sim.dtb \
- msmskunk-rumi.dtb \
- msmskunk-mtp.dtb \
- msmskunk-cdp.dtb
+dtb-$(CONFIG_ARCH_SDM845) += sdm845-sim.dtb \
+ sdm845-rumi.dtb \
+ sdm845-mtp.dtb \
+ sdm845-cdp.dtb
-dtb-$(CONFIG_ARCH_SDMBAT) += sdmbat-sim.dtb \
- sdmbat-rumi.dtb \
- sdmbat-mtp.dtb \
- sdmbat-cdp.dtb
+dtb-$(CONFIG_ARCH_SDM830) += sdm830-sim.dtb \
+ sdm830-rumi.dtb \
+ sdm830-mtp.dtb \
+ sdm830-cdp.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
diff --git a/arch/arm64/boot/dts/qcom/msm-arm-smmu-skunk.dtsi b/arch/arm64/boot/dts/qcom/msm-arm-smmu-sdm845.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/msm-arm-smmu-skunk.dtsi
rename to arch/arm64/boot/dts/qcom/msm-arm-smmu-sdm845.dtsi
diff --git a/arch/arm64/boot/dts/qcom/msm-gdsc-skunk.dtsi b/arch/arm64/boot/dts/qcom/msm-gdsc-sdm845.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/msm-gdsc-skunk.dtsi
rename to arch/arm64/boot/dts/qcom/msm-gdsc-sdm845.dtsi
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-cdp.dts b/arch/arm64/boot/dts/qcom/msmskunk-cdp.dts
deleted file mode 100644
index b1dd404..0000000
--- a/arch/arm64/boot/dts/qcom/msmskunk-cdp.dts
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright (c) 2016, 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 "msmskunk.dtsi"
-#include "msmskunk-cdp.dtsi"
-
-/ {
- model = "Qualcomm Technologies, Inc. MSM skunk v1 CDP";
- compatible = "qcom,msmskunk-cdp", "qcom,msmskunk", "qcom,cdp";
- qcom,board-id = <1 0>;
-};
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-mtp.dts b/arch/arm64/boot/dts/qcom/msmskunk-mtp.dts
deleted file mode 100644
index d6a6ffb..0000000
--- a/arch/arm64/boot/dts/qcom/msmskunk-mtp.dts
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright (c) 2016, 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 "msmskunk.dtsi"
-#include "msmskunk-mtp.dtsi"
-
-/ {
- model = "Qualcomm Technologies, Inc. MSM skunk v1 MTP";
- compatible = "qcom,msmskunk-mtp", "qcom,msmskunk", "qcom,mtp";
- qcom,board-id = <8 0>;
-};
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-mtp.dtsi b/arch/arm64/boot/dts/qcom/msmskunk-mtp.dtsi
deleted file mode 100644
index 930c8de..0000000
--- a/arch/arm64/boot/dts/qcom/msmskunk-mtp.dtsi
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Copyright (c) 2016, 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 "msmskunk-pinctrl.dtsi"
-
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-sim.dts b/arch/arm64/boot/dts/qcom/msmskunk-sim.dts
deleted file mode 100644
index eb95256..0000000
--- a/arch/arm64/boot/dts/qcom/msmskunk-sim.dts
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright (c) 2016, 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/;
-/memreserve/ 0x90000000 0x00000100;
-
-#include "msmskunk.dtsi"
-#include "msmskunk-sim.dtsi"
-
-/ {
- model = "Qualcomm Technologies, Inc. MSM SKUNK SIM";
- compatible = "qcom,msmskunk-sim", "qcom,msmskunk", "qcom,sim";
- qcom,board-id = <16 0>;
-};
diff --git a/arch/arm64/boot/dts/qcom/sdmbat-cdp.dts b/arch/arm64/boot/dts/qcom/sdm830-cdp.dts
similarity index 85%
rename from arch/arm64/boot/dts/qcom/sdmbat-cdp.dts
rename to arch/arm64/boot/dts/qcom/sdm830-cdp.dts
index f8f916e..dab4a9d 100644
--- a/arch/arm64/boot/dts/qcom/sdmbat-cdp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm830-cdp.dts
@@ -13,11 +13,11 @@
/dts-v1/;
-#include "sdmbat.dtsi"
-#include "sdmbat-cdp.dtsi"
+#include "sdm830.dtsi"
+#include "sdm830-cdp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM bat v1 CDP";
- compatible = "qcom,sdmbat-cdp", "qcom,sdmbat", "qcom,cdp";
+ compatible = "qcom,sdm830-cdp", "qcom,sdm830", "qcom,cdp";
qcom,board-id = <1 0>;
};
diff --git a/arch/arm64/boot/dts/qcom/sdmbat-cdp.dtsi b/arch/arm64/boot/dts/qcom/sdm830-cdp.dtsi
similarity index 89%
copy from arch/arm64/boot/dts/qcom/sdmbat-cdp.dtsi
copy to arch/arm64/boot/dts/qcom/sdm830-cdp.dtsi
index 77151c5..c7bbef0 100644
--- a/arch/arm64/boot/dts/qcom/sdmbat-cdp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm830-cdp.dtsi
@@ -10,5 +10,5 @@
* GNU General Public License for more details.
*/
-#include "msmskunk-cdp.dtsi"
-#include "sdmbat-pinctrl.dtsi"
+#include "sdm845-cdp.dtsi"
+#include "sdm830-pinctrl.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sdmbat-mtp.dts b/arch/arm64/boot/dts/qcom/sdm830-mtp.dts
similarity index 85%
rename from arch/arm64/boot/dts/qcom/sdmbat-mtp.dts
rename to arch/arm64/boot/dts/qcom/sdm830-mtp.dts
index fb8e85a..5da16e6 100644
--- a/arch/arm64/boot/dts/qcom/sdmbat-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm830-mtp.dts
@@ -13,11 +13,11 @@
/dts-v1/;
-#include "sdmbat.dtsi"
-#include "sdmbat-mtp.dtsi"
+#include "sdm830.dtsi"
+#include "sdm830-mtp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM bat v1 MTP";
- compatible = "qcom,sdmbat-mtp", "qcom,sdmbat", "qcom,mtp";
+ compatible = "qcom,sdm830-mtp", "qcom,sdm830", "qcom,mtp";
qcom,board-id = <8 0>;
};
diff --git a/arch/arm64/boot/dts/qcom/sdmbat-cdp.dtsi b/arch/arm64/boot/dts/qcom/sdm830-mtp.dtsi
similarity index 89%
rename from arch/arm64/boot/dts/qcom/sdmbat-cdp.dtsi
rename to arch/arm64/boot/dts/qcom/sdm830-mtp.dtsi
index 77151c5..b2d607d 100644
--- a/arch/arm64/boot/dts/qcom/sdmbat-cdp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm830-mtp.dtsi
@@ -10,5 +10,5 @@
* GNU General Public License for more details.
*/
-#include "msmskunk-cdp.dtsi"
-#include "sdmbat-pinctrl.dtsi"
+#include "sdm845-mtp.dtsi"
+#include "sdm830-pinctrl.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sdmbat-pinctrl.dtsi b/arch/arm64/boot/dts/qcom/sdm830-pinctrl.dtsi
similarity index 94%
rename from arch/arm64/boot/dts/qcom/sdmbat-pinctrl.dtsi
rename to arch/arm64/boot/dts/qcom/sdm830-pinctrl.dtsi
index ead34a6..a8d559c 100644
--- a/arch/arm64/boot/dts/qcom/sdmbat-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm830-pinctrl.dtsi
@@ -12,7 +12,7 @@
&soc {
tlmm: pinctrl@03800000 {
- compatible = "qcom,sdmbat-pinctrl";
+ compatible = "qcom,sdm830-pinctrl";
reg = <0x03800000 0xc00000>;
interrupts = <0 208 0>;
gpio-controller;
diff --git a/arch/arm64/boot/dts/qcom/sdmbat-rumi.dts b/arch/arm64/boot/dts/qcom/sdm830-rumi.dts
similarity index 78%
rename from arch/arm64/boot/dts/qcom/sdmbat-rumi.dts
rename to arch/arm64/boot/dts/qcom/sdm830-rumi.dts
index 2bf868e..2485051 100644
--- a/arch/arm64/boot/dts/qcom/sdmbat-rumi.dts
+++ b/arch/arm64/boot/dts/qcom/sdm830-rumi.dts
@@ -14,12 +14,12 @@
/dts-v1/;
/memreserve/ 0x90000000 0x00000100;
-#include "sdmbat.dtsi"
-#include "sdmbat-rumi.dtsi"
+#include "sdm830.dtsi"
+#include "sdm830-rumi.dtsi"
/ {
- model = "Qualcomm Technologies, Inc. SDM BAT RUMI";
- compatible = "qcom,sdmbat-rumi", "qcom,sdmbat", "qcom,rumi";
+ model = "Qualcomm Technologies, Inc. SDM830 RUMI";
+ compatible = "qcom,sdm830-rumi", "qcom,sdm830", "qcom,rumi";
qcom,board-id = <15 0>;
};
diff --git a/arch/arm64/boot/dts/qcom/sdmbat-rumi.dtsi b/arch/arm64/boot/dts/qcom/sdm830-rumi.dtsi
similarity index 92%
rename from arch/arm64/boot/dts/qcom/sdmbat-rumi.dtsi
rename to arch/arm64/boot/dts/qcom/sdm830-rumi.dtsi
index 11901f1..2bc5f3f 100644
--- a/arch/arm64/boot/dts/qcom/sdmbat-rumi.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm830-rumi.dtsi
@@ -13,8 +13,8 @@
/*
* As a general rule, only version-specific property overrides should be placed
* inside this file. Common device definitions should be placed inside the
- * msmskunk-rumi.dtsi file.
+ * sdm845-rumi.dtsi file.
*/
- #include "msmskunk-rumi.dtsi"
+ #include "sdm845-rumi.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sdmbat-sim.dts b/arch/arm64/boot/dts/qcom/sdm830-sim.dts
similarity index 79%
rename from arch/arm64/boot/dts/qcom/sdmbat-sim.dts
rename to arch/arm64/boot/dts/qcom/sdm830-sim.dts
index 216b3d0..57cd155 100644
--- a/arch/arm64/boot/dts/qcom/sdmbat-sim.dts
+++ b/arch/arm64/boot/dts/qcom/sdm830-sim.dts
@@ -14,12 +14,12 @@
/dts-v1/;
/memreserve/ 0x90000000 0x00000100;
-#include "sdmbat.dtsi"
-#include "sdmbat-sim.dtsi"
+#include "sdm830.dtsi"
+#include "sdm830-sim.dtsi"
/ {
- model = "Qualcomm Technologies, Inc. SDM BAT SIM";
- compatible = "qcom,sdmbat-sim", "qcom,sdmbat", "qcom,sim";
+ model = "Qualcomm Technologies, Inc. SDM830 SIM";
+ compatible = "qcom,sdm830-sim", "qcom,sdm830", "qcom,sim";
qcom,board-id = <16 0>;
};
diff --git a/arch/arm64/boot/dts/qcom/sdmbat-sim.dtsi b/arch/arm64/boot/dts/qcom/sdm830-sim.dtsi
similarity index 92%
rename from arch/arm64/boot/dts/qcom/sdmbat-sim.dtsi
rename to arch/arm64/boot/dts/qcom/sdm830-sim.dtsi
index 560ad45..85e8075 100644
--- a/arch/arm64/boot/dts/qcom/sdmbat-sim.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm830-sim.dtsi
@@ -13,8 +13,8 @@
/*
* As a general rule, only version-specific property overrides should be placed
* inside this file. Common device definitions should be placed inside the
- * msmskunk-sim.dtsi file.
+ * sdm845-sim.dtsi file.
*/
- #include "msmskunk-sim.dtsi"
+ #include "sdm845-sim.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sdmbat.dtsi b/arch/arm64/boot/dts/qcom/sdm830.dtsi
similarity index 86%
rename from arch/arm64/boot/dts/qcom/sdmbat.dtsi
rename to arch/arm64/boot/dts/qcom/sdm830.dtsi
index 950d130..ff0d9a0 100644
--- a/arch/arm64/boot/dts/qcom/sdmbat.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm830.dtsi
@@ -13,14 +13,14 @@
/*
* As a general rule, only version-specific property overrides should be placed
* inside this file. Common device definitions should be placed inside the
- * msmskunk.dtsi file.
+ * sdm845.dtsi file.
*/
- #include "msmskunk.dtsi"
+ #include "sdm845.dtsi"
/ {
- model = "Qualcomm Technologies, Inc. SDM BAT";
- compatible = "qcom,sdmbat";
+ model = "Qualcomm Technologies, Inc. SDM830";
+ compatible = "qcom,sdm830";
qcom,msm-id = <328 0x0>;
};
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-bus.dtsi b/arch/arm64/boot/dts/qcom/sdm845-bus.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/msmskunk-bus.dtsi
rename to arch/arm64/boot/dts/qcom/sdm845-bus.dtsi
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-camera.dtsi b/arch/arm64/boot/dts/qcom/sdm845-camera.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/msmskunk-camera.dtsi
rename to arch/arm64/boot/dts/qcom/sdm845-camera.dtsi
diff --git a/arch/arm64/boot/dts/qcom/sdmbat-cdp.dts b/arch/arm64/boot/dts/qcom/sdm845-cdp.dts
similarity index 77%
copy from arch/arm64/boot/dts/qcom/sdmbat-cdp.dts
copy to arch/arm64/boot/dts/qcom/sdm845-cdp.dts
index f8f916e..22e3aea 100644
--- a/arch/arm64/boot/dts/qcom/sdmbat-cdp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-cdp.dts
@@ -13,11 +13,11 @@
/dts-v1/;
-#include "sdmbat.dtsi"
-#include "sdmbat-cdp.dtsi"
+#include "sdm845.dtsi"
+#include "sdm845-cdp.dtsi"
/ {
- model = "Qualcomm Technologies, Inc. SDM bat v1 CDP";
- compatible = "qcom,sdmbat-cdp", "qcom,sdmbat", "qcom,cdp";
+ model = "Qualcomm Technologies, Inc. MSM sdm845 v1 CDP";
+ compatible = "qcom,sdm845-cdp", "qcom,sdm845", "qcom,cdp";
qcom,board-id = <1 0>;
};
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-cdp.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cdp.dtsi
similarity index 93%
rename from arch/arm64/boot/dts/qcom/msmskunk-cdp.dtsi
rename to arch/arm64/boot/dts/qcom/sdm845-cdp.dtsi
index 930c8de..00bd301 100644
--- a/arch/arm64/boot/dts/qcom/msmskunk-cdp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-cdp.dtsi
@@ -10,5 +10,5 @@
* GNU General Public License for more details.
*/
-#include "msmskunk-pinctrl.dtsi"
+#include "sdm845-pinctrl.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-coresight.dtsi b/arch/arm64/boot/dts/qcom/sdm845-coresight.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/msmskunk-coresight.dtsi
rename to arch/arm64/boot/dts/qcom/sdm845-coresight.dtsi
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-ion.dtsi b/arch/arm64/boot/dts/qcom/sdm845-ion.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/msmskunk-ion.dtsi
rename to arch/arm64/boot/dts/qcom/sdm845-ion.dtsi
diff --git a/arch/arm64/boot/dts/qcom/sdmbat-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
similarity index 77%
copy from arch/arm64/boot/dts/qcom/sdmbat-mtp.dts
copy to arch/arm64/boot/dts/qcom/sdm845-mtp.dts
index fb8e85a..f7af60c 100644
--- a/arch/arm64/boot/dts/qcom/sdmbat-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -13,11 +13,11 @@
/dts-v1/;
-#include "sdmbat.dtsi"
-#include "sdmbat-mtp.dtsi"
+#include "sdm845.dtsi"
+#include "sdm845-mtp.dtsi"
/ {
- model = "Qualcomm Technologies, Inc. SDM bat v1 MTP";
- compatible = "qcom,sdmbat-mtp", "qcom,sdmbat", "qcom,mtp";
+ model = "Qualcomm Technologies, Inc. MSM sdm845 v1 MTP";
+ compatible = "qcom,sdm845-mtp", "qcom,sdm845", "qcom,mtp";
qcom,board-id = <8 0>;
};
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-cdp.dtsi b/arch/arm64/boot/dts/qcom/sdm845-mtp.dtsi
similarity index 93%
copy from arch/arm64/boot/dts/qcom/msmskunk-cdp.dtsi
copy to arch/arm64/boot/dts/qcom/sdm845-mtp.dtsi
index 930c8de..00bd301 100644
--- a/arch/arm64/boot/dts/qcom/msmskunk-cdp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dtsi
@@ -10,5 +10,5 @@
* GNU General Public License for more details.
*/
-#include "msmskunk-pinctrl.dtsi"
+#include "sdm845-pinctrl.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-pinctrl.dtsi b/arch/arm64/boot/dts/qcom/sdm845-pinctrl.dtsi
similarity index 94%
rename from arch/arm64/boot/dts/qcom/msmskunk-pinctrl.dtsi
rename to arch/arm64/boot/dts/qcom/sdm845-pinctrl.dtsi
index 84010bd..a69525c 100644
--- a/arch/arm64/boot/dts/qcom/msmskunk-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-pinctrl.dtsi
@@ -12,7 +12,7 @@
&soc {
tlmm: pinctrl@03400000 {
- compatible = "qcom,msmskunk-pinctrl";
+ compatible = "qcom,sdm845-pinctrl";
reg = <0x03800000 0xc00000>;
interrupts = <0 208 0>;
gpio-controller;
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-regulator.dtsi b/arch/arm64/boot/dts/qcom/sdm845-regulator.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/msmskunk-regulator.dtsi
rename to arch/arm64/boot/dts/qcom/sdm845-regulator.dtsi
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-rumi.dts b/arch/arm64/boot/dts/qcom/sdm845-rumi.dts
similarity index 86%
rename from arch/arm64/boot/dts/qcom/msmskunk-rumi.dts
rename to arch/arm64/boot/dts/qcom/sdm845-rumi.dts
index f22e5fd..7a4ac64 100644
--- a/arch/arm64/boot/dts/qcom/msmskunk-rumi.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-rumi.dts
@@ -14,12 +14,12 @@
/dts-v1/;
/memreserve/ 0x90000000 0x00000100;
-#include "msmskunk.dtsi"
-#include "msmskunk-rumi.dtsi"
-#include "msmskunk-usb.dtsi"
+#include "sdm845.dtsi"
+#include "sdm845-rumi.dtsi"
+#include "sdm845-usb.dtsi"
/ {
- model = "Qualcomm Technologies, Inc. MSM SKUNK RUMI";
- compatible = "qcom,msmskunk-rumi", "qcom,msmskunk", "qcom,rumi";
+ model = "Qualcomm Technologies, Inc. SDM845 RUMI";
+ compatible = "qcom,sdm845-rumi", "qcom,sdm845", "qcom,rumi";
qcom,board-id = <15 0>;
};
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-rumi.dtsi b/arch/arm64/boot/dts/qcom/sdm845-rumi.dtsi
similarity index 96%
rename from arch/arm64/boot/dts/qcom/msmskunk-rumi.dtsi
rename to arch/arm64/boot/dts/qcom/sdm845-rumi.dtsi
index 1f235d3..3d70a17 100644
--- a/arch/arm64/boot/dts/qcom/msmskunk-rumi.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-rumi.dtsi
@@ -11,7 +11,7 @@
*/
&ufsphy_mem {
- compatible = "qcom,ufs-phy-qrbtc-msmskunk";
+ compatible = "qcom,ufs-phy-qrbtc-sdm845";
vdda-phy-supply = <&pm8998_l1>;
vdda-pll-supply = <&pm8998_l2>;
@@ -64,7 +64,7 @@
};
&ufsphy_card {
- compatible = "qcom,ufs-phy-qrbtc-msmskunk";
+ compatible = "qcom,ufs-phy-qrbtc-sdm845";
vdda-phy-supply = <&pm8998_l1>; /* 0.88v */
vdda-pll-supply = <&pm8998_l26>; /* 1.2v */
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-sde-display.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sde-display.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/msmskunk-sde-display.dtsi
rename to arch/arm64/boot/dts/qcom/sdm845-sde-display.dtsi
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-sde.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sde.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/msmskunk-sde.dtsi
rename to arch/arm64/boot/dts/qcom/sdm845-sde.dtsi
diff --git a/arch/arm64/boot/dts/qcom/sdmbat-sim.dts b/arch/arm64/boot/dts/qcom/sdm845-sim.dts
similarity index 78%
copy from arch/arm64/boot/dts/qcom/sdmbat-sim.dts
copy to arch/arm64/boot/dts/qcom/sdm845-sim.dts
index 216b3d0..2fa77bb 100644
--- a/arch/arm64/boot/dts/qcom/sdmbat-sim.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-sim.dts
@@ -14,12 +14,11 @@
/dts-v1/;
/memreserve/ 0x90000000 0x00000100;
-#include "sdmbat.dtsi"
-#include "sdmbat-sim.dtsi"
+#include "sdm845.dtsi"
+#include "sdm845-sim.dtsi"
/ {
- model = "Qualcomm Technologies, Inc. SDM BAT SIM";
- compatible = "qcom,sdmbat-sim", "qcom,sdmbat", "qcom,sim";
+ model = "Qualcomm Technologies, Inc. SDM845 SIM";
+ compatible = "qcom,sdm845-sim", "qcom,sdm845", "qcom,sim";
qcom,board-id = <16 0>;
};
-
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-sim.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sim.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/msmskunk-sim.dtsi
rename to arch/arm64/boot/dts/qcom/sdm845-sim.dtsi
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-smp2p.dtsi b/arch/arm64/boot/dts/qcom/sdm845-smp2p.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/msmskunk-smp2p.dtsi
rename to arch/arm64/boot/dts/qcom/sdm845-smp2p.dtsi
diff --git a/arch/arm64/boot/dts/qcom/msmskunk-usb.dtsi b/arch/arm64/boot/dts/qcom/sdm845-usb.dtsi
similarity index 98%
rename from arch/arm64/boot/dts/qcom/msmskunk-usb.dtsi
rename to arch/arm64/boot/dts/qcom/sdm845-usb.dtsi
index dd6d4d4..442fcff 100644
--- a/arch/arm64/boot/dts/qcom/msmskunk-usb.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-usb.dtsi
@@ -11,7 +11,7 @@
* GNU General Public License for more details.
*/
-#include <dt-bindings/clock/qcom,gcc-skunk.h>
+#include <dt-bindings/clock/qcom,gcc-sdm845.h>
&soc {
usb3: ssusb@a600000 {
compatible = "qcom,dwc-usb3-msm";
diff --git a/arch/arm64/boot/dts/qcom/msmskunk.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
similarity index 97%
rename from arch/arm64/boot/dts/qcom/msmskunk.dtsi
rename to arch/arm64/boot/dts/qcom/sdm845.dtsi
index ff18e02..27d703f 100644
--- a/arch/arm64/boot/dts/qcom/msmskunk.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -11,19 +11,19 @@
*/
#include "skeleton64.dtsi"
-#include <dt-bindings/clock/qcom,gcc-skunk.h>
-#include <dt-bindings/clock/qcom,camcc-skunk.h>
-#include <dt-bindings/clock/qcom,dispcc-skunk.h>
-#include <dt-bindings/clock/qcom,gpucc-skunk.h>
-#include <dt-bindings/clock/qcom,videocc-skunk.h>
-#include <dt-bindings/clock/qcom,cpucc-skunk.h>
+#include <dt-bindings/clock/qcom,gcc-sdm845.h>
+#include <dt-bindings/clock/qcom,camcc-sdm845.h>
+#include <dt-bindings/clock/qcom,dispcc-sdm845.h>
+#include <dt-bindings/clock/qcom,gpucc-sdm845.h>
+#include <dt-bindings/clock/qcom,videocc-sdm845.h>
+#include <dt-bindings/clock/qcom,cpucc-sdm845.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/soc/qcom,tcs-mbox.h>
/ {
- model = "Qualcomm Technologies, Inc. MSM SKUNK";
- compatible = "qcom,msmskunk";
+ model = "Qualcomm Technologies, Inc. SDM845";
+ compatible = "qcom,sdm845";
qcom,msm-id = <321 0x0>;
interrupt-parent = <&intc>;
@@ -376,9 +376,9 @@
};
};
-#include "msm-gdsc-skunk.dtsi"
-#include "msmskunk-sde.dtsi"
-#include "msmskunk-sde-display.dtsi"
+#include "msm-gdsc-sdm845.dtsi"
+#include "sdm845-sde.dtsi"
+#include "sdm845-sde-display.dtsi"
&soc {
#address-cells = <1>;
@@ -466,7 +466,7 @@
};
clock_gcc: qcom,gcc@100000 {
- compatible = "qcom,gcc-msmskunk";
+ compatible = "qcom,gcc-sdm845";
reg = <0x100000 0x1f0000>;
reg-names = "cc_base";
vdd_cx-supply = <&pm8998_s9_level>;
@@ -476,7 +476,7 @@
};
clock_videocc: qcom,videocc@ab00000 {
- compatible = "qcom,video_cc-msmskunk";
+ compatible = "qcom,video_cc-sdm845";
reg = <0xab00000 0x10000>;
reg-names = "cc_base";
vdd_cx-supply = <&pm8998_s9_level>;
@@ -1075,8 +1075,8 @@
reg = <0x1300000 0x50000>;
reg-names = "llcc_base";
- llcc: qcom,msmskunk-llcc {
- compatible = "qcom,msmskunk-llcc";
+ llcc: qcom,sdm845-llcc {
+ compatible = "qcom,sdm845-llcc";
#cache-cells = <1>;
max-slices = <32>;
qcom,dump-size = <0x3c0000>;
@@ -1612,10 +1612,10 @@
status = "ok";
};
-#include "msmskunk-regulator.dtsi"
-#include "msmskunk-coresight.dtsi"
-#include "msm-arm-smmu-skunk.dtsi"
-#include "msmskunk-ion.dtsi"
-#include "msmskunk-smp2p.dtsi"
-#include "msmskunk-camera.dtsi"
-#include "msmskunk-bus.dtsi"
+#include "sdm845-regulator.dtsi"
+#include "sdm845-coresight.dtsi"
+#include "msm-arm-smmu-sdm845.dtsi"
+#include "sdm845-ion.dtsi"
+#include "sdm845-smp2p.dtsi"
+#include "sdm845-camera.dtsi"
+#include "sdm845-bus.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sdmbat-mtp.dtsi b/arch/arm64/boot/dts/qcom/sdmbat-mtp.dtsi
deleted file mode 100644
index af7a194..0000000
--- a/arch/arm64/boot/dts/qcom/sdmbat-mtp.dtsi
+++ /dev/null
@@ -1,14 +0,0 @@
-/* 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
- * 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 "msmskunk-mtp.dtsi"
-#include "sdmbat-pinctrl.dtsi"