arm/dt: msm8226: add device tree support for 8x26 v2
The top level DTS files need to uniquely identify different versions
of the chip. Split them off for v1 and v2 specific files.
Change-Id: Ia7d58cdc82337124d348945e4b560dc4babf364a
Signed-off-by: Syed Rameez Mustafa <rameezmustafa@codeaurora.org>
diff --git a/arch/arm/boot/dts/msm8226-cdp.dts b/arch/arm/boot/dts/msm8226-v1-cdp.dts
similarity index 96%
rename from arch/arm/boot/dts/msm8226-cdp.dts
rename to arch/arm/boot/dts/msm8226-v1-cdp.dts
index da517eb..e4d1c4e 100644
--- a/arch/arm/boot/dts/msm8226-cdp.dts
+++ b/arch/arm/boot/dts/msm8226-v1-cdp.dts
@@ -11,7 +11,7 @@
*/
/dts-v1/;
-/include/ "msm8226.dtsi"
+/include/ "msm8226-v1.dtsi"
/include/ "msm8226-cdp.dtsi"
/ {
diff --git a/arch/arm/boot/dts/msm8226-mtp.dts b/arch/arm/boot/dts/msm8226-v1-mtp.dts
similarity index 96%
rename from arch/arm/boot/dts/msm8226-mtp.dts
rename to arch/arm/boot/dts/msm8226-v1-mtp.dts
index 2881274..8e63a89 100644
--- a/arch/arm/boot/dts/msm8226-mtp.dts
+++ b/arch/arm/boot/dts/msm8226-v1-mtp.dts
@@ -11,7 +11,7 @@
*/
/dts-v1/;
-/include/ "msm8226.dtsi"
+/include/ "msm8226-v1.dtsi"
/include/ "msm8226-mtp.dtsi"
/ {
diff --git a/arch/arm/boot/dts/msm8226-qrd.dts b/arch/arm/boot/dts/msm8226-v1-qrd.dts
similarity index 96%
rename from arch/arm/boot/dts/msm8226-qrd.dts
rename to arch/arm/boot/dts/msm8226-v1-qrd.dts
index e364de7..1d1bc00 100644
--- a/arch/arm/boot/dts/msm8226-qrd.dts
+++ b/arch/arm/boot/dts/msm8226-v1-qrd.dts
@@ -11,7 +11,7 @@
*/
/dts-v1/;
-/include/ "msm8226.dtsi"
+/include/ "msm8226-v1.dtsi"
/include/ "msm8226-qrd.dtsi"
/ {
diff --git a/arch/arm/boot/dts/msm8226-mtp.dts b/arch/arm/boot/dts/msm8226-v1.dtsi
similarity index 70%
copy from arch/arm/boot/dts/msm8226-mtp.dts
copy to arch/arm/boot/dts/msm8226-v1.dtsi
index 2881274..d471bec 100644
--- a/arch/arm/boot/dts/msm8226-mtp.dts
+++ b/arch/arm/boot/dts/msm8226-v1.dtsi
@@ -10,15 +10,10 @@
* GNU General Public License for more details.
*/
-/dts-v1/;
-/include/ "msm8226.dtsi"
-/include/ "msm8226-mtp.dtsi"
+/*
+ * As a general rule, only version-specific property overrides should be placed
+ * inside this file. However, device definitions should be placed inside the
+ * msm8226.dtsi file.
+ */
-/ {
- model = "Qualcomm MSM 8226 MTP";
- compatible = "qcom,msm8226-mtp", "qcom,msm8226", "qcom,mtp";
- qcom,msm-id = <145 8 0>,
- <158 8 0>,
- <159 8 0>,
- <198 8 0>;
-};
+/include/ "msm8226.dtsi"
diff --git a/arch/arm/boot/dts/msm8226-cdp.dts b/arch/arm/boot/dts/msm8226-v2-cdp.dts
similarity index 78%
copy from arch/arm/boot/dts/msm8226-cdp.dts
copy to arch/arm/boot/dts/msm8226-v2-cdp.dts
index da517eb..ef81ead 100644
--- a/arch/arm/boot/dts/msm8226-cdp.dts
+++ b/arch/arm/boot/dts/msm8226-v2-cdp.dts
@@ -11,14 +11,14 @@
*/
/dts-v1/;
-/include/ "msm8226.dtsi"
+/include/ "msm8226-v2.dtsi"
/include/ "msm8226-cdp.dtsi"
/ {
- model = "Qualcomm MSM 8226 CDP";
+ model = "Qualcomm MSM 8226v2 CDP";
compatible = "qcom,msm8226-cdp", "qcom,msm8226", "qcom,cdp";
- qcom,msm-id = <145 1 0>,
- <158 1 0>,
- <159 1 0>,
- <198 1 0>;
+ qcom,msm-id = <145 1 0x20000>,
+ <158 1 0x20000>,
+ <159 1 0x20000>,
+ <198 1 0x20000>;
};
diff --git a/arch/arm/boot/dts/msm8226-mtp.dts b/arch/arm/boot/dts/msm8226-v2-mtp.dts
similarity index 78%
copy from arch/arm/boot/dts/msm8226-mtp.dts
copy to arch/arm/boot/dts/msm8226-v2-mtp.dts
index 2881274..ea8cb5c 100644
--- a/arch/arm/boot/dts/msm8226-mtp.dts
+++ b/arch/arm/boot/dts/msm8226-v2-mtp.dts
@@ -11,14 +11,14 @@
*/
/dts-v1/;
-/include/ "msm8226.dtsi"
+/include/ "msm8226-v2.dtsi"
/include/ "msm8226-mtp.dtsi"
/ {
- model = "Qualcomm MSM 8226 MTP";
+ model = "Qualcomm MSM 8226v2 MTP";
compatible = "qcom,msm8226-mtp", "qcom,msm8226", "qcom,mtp";
- qcom,msm-id = <145 8 0>,
- <158 8 0>,
- <159 8 0>,
- <198 8 0>;
+ qcom,msm-id = <145 8 0x20000>,
+ <158 8 0x20000>,
+ <159 8 0x20000>,
+ <198 8 0x20000>;
};
diff --git a/arch/arm/boot/dts/msm8226-qrd.dts b/arch/arm/boot/dts/msm8226-v2-qrd.dts
similarity index 78%
copy from arch/arm/boot/dts/msm8226-qrd.dts
copy to arch/arm/boot/dts/msm8226-v2-qrd.dts
index e364de7..797265e 100644
--- a/arch/arm/boot/dts/msm8226-qrd.dts
+++ b/arch/arm/boot/dts/msm8226-v2-qrd.dts
@@ -11,14 +11,14 @@
*/
/dts-v1/;
-/include/ "msm8226.dtsi"
+/include/ "msm8226-v2.dtsi"
/include/ "msm8226-qrd.dtsi"
/ {
- model = "Qualcomm MSM 8226 QRD";
+ model = "Qualcomm MSM 8226v2 QRD";
compatible = "qcom,msm8226-qrd", "qcom,msm8226", "qcom,qrd";
- qcom,msm-id = <145 11 0>,
- <158 11 0>,
- <159 11 0>,
- <198 11 0>;
+ qcom,msm-id = <145 11 0x20000>,
+ <158 11 0x20000>,
+ <159 11 0x20000>,
+ <198 11 0x20000>;
};
diff --git a/arch/arm/boot/dts/msm8226-mtp.dts b/arch/arm/boot/dts/msm8226-v2.dtsi
similarity index 70%
copy from arch/arm/boot/dts/msm8226-mtp.dts
copy to arch/arm/boot/dts/msm8226-v2.dtsi
index 2881274..d471bec 100644
--- a/arch/arm/boot/dts/msm8226-mtp.dts
+++ b/arch/arm/boot/dts/msm8226-v2.dtsi
@@ -10,15 +10,10 @@
* GNU General Public License for more details.
*/
-/dts-v1/;
-/include/ "msm8226.dtsi"
-/include/ "msm8226-mtp.dtsi"
+/*
+ * As a general rule, only version-specific property overrides should be placed
+ * inside this file. However, device definitions should be placed inside the
+ * msm8226.dtsi file.
+ */
-/ {
- model = "Qualcomm MSM 8226 MTP";
- compatible = "qcom,msm8226-mtp", "qcom,msm8226", "qcom,mtp";
- qcom,msm-id = <145 8 0>,
- <158 8 0>,
- <159 8 0>,
- <198 8 0>;
-};
+/include/ "msm8226.dtsi"