summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Garberi <dade.garberi@gmail.com>2018-09-28 21:43:24 +0200
committerDavide Garberi <dade.garberi@gmail.com>2022-07-27 18:58:41 +0200
commit88610df7c01cf15c5ffd3f3dae546c2fcdfccbed (patch)
tree89e40b580fc8e1aa698b730845718befa78c447f
parentbf0c5d760d2512647d2336e4cf479172cb301ca4 (diff)
dts: zuk: Move common delete-node to common file
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
-rwxr-xr-xarch/arm/boot/dts/qcom/zuk/common-camera-sensor.dtsi3
-rwxr-xr-xarch/arm/boot/dts/qcom/zuk/z2_plus-camera-sensor.dtsi3
-rwxr-xr-xarch/arm/boot/dts/qcom/zuk/z2_row-camera-sensor.dtsi4
3 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/qcom/zuk/common-camera-sensor.dtsi b/arch/arm/boot/dts/qcom/zuk/common-camera-sensor.dtsi
index aa17dcda76f5..412adad704c3 100755
--- a/arch/arm/boot/dts/qcom/zuk/common-camera-sensor.dtsi
+++ b/arch/arm/boot/dts/qcom/zuk/common-camera-sensor.dtsi
@@ -1,4 +1,7 @@
&cci {
+ /delete-node/ qcom,actuator@1;
+ /delete-node/ qcom,eeprom@0;
+ /delete-node/ qcom,camera@0;
/delete-node/ qcom,camera@1;
/delete-node/ qcom,eeprom@1;
/delete-node/ qcom,camera@2;
diff --git a/arch/arm/boot/dts/qcom/zuk/z2_plus-camera-sensor.dtsi b/arch/arm/boot/dts/qcom/zuk/z2_plus-camera-sensor.dtsi
index 4a68711292ad..21d896cf09c6 100755
--- a/arch/arm/boot/dts/qcom/zuk/z2_plus-camera-sensor.dtsi
+++ b/arch/arm/boot/dts/qcom/zuk/z2_plus-camera-sensor.dtsi
@@ -8,10 +8,7 @@
};
&cci {
- /delete-node/ qcom,actuator@1;
/delete-node/ qcom,ois@0;
- /delete-node/ qcom,eeprom@0;
- /delete-node/ qcom,camera@0;
qcom,camera@0 {
cell-index = <0>;
diff --git a/arch/arm/boot/dts/qcom/zuk/z2_row-camera-sensor.dtsi b/arch/arm/boot/dts/qcom/zuk/z2_row-camera-sensor.dtsi
index 0f32b5d99241..1d5c2ad67a10 100755
--- a/arch/arm/boot/dts/qcom/zuk/z2_row-camera-sensor.dtsi
+++ b/arch/arm/boot/dts/qcom/zuk/z2_row-camera-sensor.dtsi
@@ -3,10 +3,6 @@
};
&cci {
- /delete-node/ qcom,actuator@1;
- /delete-node/ qcom,eeprom@0;
- /delete-node/ qcom,camera@0;
-
qcom,camera@0 {
cell-index = <0>;
compatible = "qcom,camera";