ARM: dts: ipq4019: Move xo and timer nodes to SoC dtsi

The node for xo and timer belong to the SoC DTS file.
Else, new board DT files may not inherit these nodes.

Signed-off-by: Varadarajan Narayanan <varada@codeaurora.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
index 1ce253d0f72f9a60d9d2ffdee686899bd42b008d..c055a578576964c21c806f60ae04c4a5c483ba45 100644 (file)
--- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
@@ -20,26 +20,7 @@
        model = "Qualcomm Technologies, Inc. IPQ4019/AP-DK01.1";
        compatible = "qcom,ipq4019";
 
-       clocks {
-                xo: xo {
-                        compatible = "fixed-clock";
-                        clock-frequency = <48000000>;
-                        #clock-cells = <0>;
-                };
-       };
-
        soc {
-
-
-               timer {
-                       compatible = "arm,armv7-timer";
-                       interrupts = <1 2 0xf08>,
-                                    <1 3 0xf08>,
-                                    <1 4 0xf08>,
-                                    <1 1 0xf08>;
-                       clock-frequency = <48000000>;
-               };
-
                pinctrl@1000000 {
                        serial_pins: serial_pinmux {
                                mux {

diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi
index 0eeff09856bab38522289085d1df663097223a0a..bd4b3c52d8681c8a765684273c74d572d03558e8 100644 (file)
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
@@ -96,6 +96,21 @@
                        clock-frequency = <32768>;
                        #clock-cells = <0>;
                };
+
+               xo: xo {
+                       compatible = "fixed-clock";
+                       clock-frequency = <48000000>;
+                       #clock-cells = <0>;
+               };
+       };
+
+       timer {
+               compatible = "arm,armv7-timer";
+               interrupts = <1 2 0xf08>,
+                            <1 3 0xf08>,
+                            <1 4 0xf08>,
+                            <1 1 0xf08>;
+               clock-frequency = <48000000>;
        };
 
        soc {