Merge tag 'gpio-v5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / qcom-apq8064.dtsi

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 4744fe757cf4f0b6719cafe5213dccdcd78260df..bd6907db615b4e87edd85ab16924d60f1a6f8620 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
-#include "skeleton.dtsi"
 #include <dt-bindings/clock/qcom,gcc-msm8960.h>
 #include <dt-bindings/reset/qcom,gcc-msm8960.h>
 #include <dt-bindings/clock/qcom,mmcc-msm8960.h>
@@ -10,6 +9,8 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Qualcomm APQ8064";
        compatible = "qcom,apq8064";
        interrupt-parent = <&intc>;
@@ -94,6 +95,11 @@
                };
        };
 
+       memory {
+               device_type = "memory";
+               reg = <0x0 0x0>;
+       };
+
        thermal-zones {
                cpu-thermal0 {
                        polling-delay-passive = <250>;