ARM: dts: msm: move general DT entry to sdm450-qrd-sku4.dtsi
General configs should be contained by sdm450-qrd-sku4.dtsi,
so moving general DT entry from sdm632-qrd-sku4.dts to
sdm450-qrd-sku4.dtsi.
Change-Id: I46e447328b43c58b111075dd2107723661196284
Signed-off-by: Teng Fei Fan <tengfei@codeaurora.org>
Signed-off-by: Maria Yu <aiquny@codeaurora.org>
diff --git a/arch/arm64/boot/dts/qcom/sdm450-qrd-sku4.dts b/arch/arm64/boot/dts/qcom/sdm450-qrd-sku4.dts
index ee33612..cad0c6f 100644
--- a/arch/arm64/boot/dts/qcom/sdm450-qrd-sku4.dts
+++ b/arch/arm64/boot/dts/qcom/sdm450-qrd-sku4.dts
@@ -14,8 +14,8 @@
/dts-v1/;
#include "sdm450.dtsi"
-#include "sdm450-qrd-sku4.dtsi"
#include "sdm450-pmi632.dtsi"
+#include "sdm450-qrd-sku4.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM450 + PMI632 QRD SKU4";
@@ -24,9 +24,3 @@
qcom,pmic-id = <0x010016 0x25 0x0 0x0>;
};
-&pmi632_vadc {
- chan@4a {
- qcom,scale-function = <22>;
- };
-};
-
diff --git a/arch/arm64/boot/dts/qcom/sdm450-qrd-sku4.dtsi b/arch/arm64/boot/dts/qcom/sdm450-qrd-sku4.dtsi
index bdefdc9..386bd71 100644
--- a/arch/arm64/boot/dts/qcom/sdm450-qrd-sku4.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm450-qrd-sku4.dtsi
@@ -150,3 +150,30 @@
&sdhc_2 {
cd-gpios = <&tlmm 133 0x0>;
};
+
+&pmi632_vadc {
+ chan@4a {
+ qcom,scale-function = <22>;
+ };
+};
+
+&soc {
+ gpio_keys {
+ camera_focus {
+ label = "camera_focus";
+ gpios = <&tlmm 87 0x1>;
+ linux,input-type = <1>;
+ linux,code = <0x210>;
+ debounce-interval = <15>;
+ };
+
+ camera_snapshot {
+ label = "camera_snapshot";
+ gpios = <&tlmm 86 0x1>;
+ linux,input-type = <1>;
+ linux,code = <0x2fe>;
+ debounce-interval = <15>;
+ };
+ };
+};
+
diff --git a/arch/arm64/boot/dts/qcom/sdm632-pm8004-qrd-sku4.dts b/arch/arm64/boot/dts/qcom/sdm632-pm8004-qrd-sku4.dts
index a22bb72..3472b86 100644
--- a/arch/arm64/boot/dts/qcom/sdm632-pm8004-qrd-sku4.dts
+++ b/arch/arm64/boot/dts/qcom/sdm632-pm8004-qrd-sku4.dts
@@ -14,10 +14,9 @@
/dts-v1/;
#include "sdm632.dtsi"
-#include "sdm450-qrd-sku4.dtsi"
-#include "sdm450-pmi632.dtsi"
#include "sdm632-pm8004.dtsi"
-#include "msm8953-camera-sensor-qrd.dtsi"
+#include "sdm450-pmi632.dtsi"
+#include "sdm450-qrd-sku4.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM632 + PMI632 + PM8004 QRD SKU4";
@@ -26,29 +25,3 @@
qcom,pmic-id = <0x010016 0x25 0xC 0x0>;
};
-&pmi632_vadc {
- chan@4a {
- qcom,scale-function = <22>;
- };
-};
-
-&soc {
- gpio_keys {
- camera_focus {
- label = "camera_focus";
- gpios = <&tlmm 87 0x1>;
- linux,input-type = <1>;
- linux,code = <0x210>;
- debounce-interval = <15>;
- };
-
- camera_snapshot {
- label = "camera_snapshot";
- gpios = <&tlmm 86 0x1>;
- linux,input-type = <1>;
- linux,code = <0x2fe>;
- debounce-interval = <15>;
- };
- };
-};
-
diff --git a/arch/arm64/boot/dts/qcom/sdm632-qrd-sku4.dts b/arch/arm64/boot/dts/qcom/sdm632-qrd-sku4.dts
index 3dffc497..466c8fc 100644
--- a/arch/arm64/boot/dts/qcom/sdm632-qrd-sku4.dts
+++ b/arch/arm64/boot/dts/qcom/sdm632-qrd-sku4.dts
@@ -14,9 +14,8 @@
/dts-v1/;
#include "sdm632.dtsi"
-#include "sdm450-qrd-sku4.dtsi"
#include "sdm450-pmi632.dtsi"
-#include "msm8953-camera-sensor-qrd.dtsi"
+#include "sdm450-qrd-sku4.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM632 + PMI632 QRD SKU4";
@@ -25,28 +24,3 @@
qcom,pmic-id = <0x010016 0x25 0x0 0x0>;
};
-&pmi632_vadc {
- chan@4a {
- qcom,scale-function = <22>;
- };
-};
-
-&soc {
- gpio_keys {
- camera_focus {
- label = "camera_focus";
- gpios = <&tlmm 87 0x1>;
- linux,input-type = <1>;
- linux,code = <0x210>;
- debounce-interval = <15>;
- };
-
- camera_snapshot {
- label = "camera_snapshot";
- gpios = <&tlmm 86 0x1>;
- linux,input-type = <1>;
- linux,code = <0x2fe>;
- debounce-interval = <15>;
- };
- };
-};