diff options
| author | Yangbo Lu <yangbo.lu@nxp.com> | 2018-06-25 15:37:10 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-26 16:15:14 +0300 |
| commit | dab4a02630d5cb7628bed7f2a58354aca053eda7 (patch) | |
| tree | 0d03eb00f40976dacddf1c35015a337daa60a0ff /arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi | |
| parent | 2cb785b4967aa56b0c4dc9742db413b76a373aa3 (diff) | |
| download | linux-dab4a02630d5cb7628bed7f2a58354aca053eda7.tar.xz | |
powerpc/mpc85xx: move ptp timer out of fman in dts
This patch is to move ptp timer node out of fman.
Because ptp timer will be probed by ptp_qoriq driver,
it should be an independent device in case of conflict
memory mapping.
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Acked-by: Madalin Bucur <madalin.bucur@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi')
| -rw-r--r-- | arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi index debea75fd3f0..b80aaf5f00a1 100644 --- a/arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi +++ b/arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi @@ -37,12 +37,13 @@ fman1: fman@500000 { #size-cells = <1>; cell-index = <1>; compatible = "fsl,fman"; - ranges = <0 0x500000 0x100000>; - reg = <0x500000 0x100000>; + ranges = <0 0x500000 0xfe000>; + reg = <0x500000 0xfe000>; interrupts = <97 2 0 0>, <16 2 1 0>; clocks = <&clockgen 3 1>; clock-names = "fmanclk"; fsl,qman-channel-range = <0x60 0xc>; + ptimer-handle = <&ptp_timer1>; muram@0 { compatible = "fsl,fman-muram"; @@ -93,9 +94,10 @@ fman1: fman@500000 { reg = <0x87000 0x1000>; status = "disabled"; }; +}; - ptp_timer1: ptp-timer@fe000 { - compatible = "fsl,fman-ptp-timer"; - reg = <0xfe000 0x1000>; - }; +ptp_timer1: ptp-timer@5fe000 { + compatible = "fsl,fman-ptp-timer"; + reg = <0x5fe000 0x1000>; + interrupts = <97 2 0 0>; }; |