Merge tag 'for-linus-20141015' of git://git.infradead.org/linux-mtd

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / pxa27x.dtsi

diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index a7054694598594cb91aefb77b791c6f3f1706018..80fc5d7e9ef9685cc04fb8771f6205aaeaf5932a 100644 (file)
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -1,5 +1,6 @@
 /* The pxa3xx skeleton simply augments the 2xx version */
-/include/ "pxa2xx.dtsi"
+#include "pxa2xx.dtsi"
+#include "dt-bindings/clock/pxa2xx-clock.h"
 
 / {
        model = "Marvell PXA27x familiy SoC";
@@ -35,4 +36,21 @@
                        #pwm-cells = <1>;
                };
        };
+
+       clocks {
+              /*
+               * The muxing of external clocks/internal dividers for osc* clock
+               * sources has been hidden under the carpet by now.
+               */
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+
+               pxa2xx_clks: pxa2xx_clks@41300004 {
+                       compatible = "marvell,pxa-clocks";
+                       #clock-cells = <1>;
+                       status = "okay";
+               };
+       };
+
 };