Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox...

[sfrench/cifs-2.6.git] / arch / powerpc / boot / dts / fsl / qoriq-fman3l-0.dtsi

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi
index 7f60b60601764007ba7cccfad2394b3db91524af..02f2755842ccab93a7588714ea7272f7f67785ab 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi
@@ -37,12 +37,13 @@ fman0: fman@400000 {
        #size-cells = <1>;
        cell-index = <0>;
        compatible = "fsl,fman";
-       ranges = <0 0x400000 0x100000>;
-       reg = <0x400000 0x100000>;
+       ranges = <0 0x400000 0xfe000>;
+       reg = <0x400000 0xfe000>;
        interrupts = <96 2 0 0>, <16 2 1 1>;
        clocks = <&clockgen 3 0>;
        clock-names = "fmanclk";
        fsl,qman-channel-range = <0x800 0x10>;
+       ptimer-handle = <&ptp_timer0>;
 
        muram@0 {
                compatible = "fsl,fman-muram";
@@ -86,9 +87,10 @@ fman0: fman@400000 {
                compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
                reg = <0xfd000 0x1000>;
        };
+};
 
-       ptp_timer0: ptp-timer@fe000 {
-               compatible = "fsl,fman-ptp-timer";
-               reg = <0xfe000 0x1000>;
-       };
+ptp_timer0: ptp-timer@4fe000 {
+       compatible = "fsl,fman-ptp-timer";
+       reg = <0x4fe000 0x1000>;
+       interrupts = <96 2 0 0>;
 };