iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/mpc85xx: move ptp timer out of fman in dts

Browse Source 
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>
This commit is contained in:
Yangbo Lu 2018-06-25 20:37:10 +08:00 committed by David S. Miller
parent 2cb785b496
commit dab4a02630
5 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/powerpc/boot/dts/fsl/qoriq-fman-0.dtsi
View File

@ -37,12 +37,13 @@ fman0: fman@400000 {
#size-cells = <1>; #size-cells = <1>;
cell-index = <0>; cell-index = <0>;
compatible = "fsl,fman"; compatible = "fsl,fman";
ranges = <0 0x400000 0x100000>; ranges = <0 0x400000 0xfe000>;
reg = <0x400000 0x100000>; reg = <0x400000 0xfe000>;
interrupts = <96 2 0 0>, <16 2 1 1>; interrupts = <96 2 0 0>, <16 2 1 1>;
clocks = <&clockgen 3 0>; clocks = <&clockgen 3 0>;
clock-names = "fmanclk"; clock-names = "fmanclk";
fsl,qman-channel-range = <0x40 0xc>; fsl,qman-channel-range = <0x40 0xc>;
ptimer-handle = <&ptp_timer0>;
muram@0 { muram@0 {
compatible = "fsl,fman-muram"; compatible = "fsl,fman-muram";
@ -93,9 +94,10 @@ fman0: fman@400000 {
reg = <0x87000 0x1000>; reg = <0x87000 0x1000>;
status = "disabled"; status = "disabled";
}; };
};
ptp_timer0: ptp-timer@fe000 {
compatible = "fsl,fman-ptp-timer"; ptp_timer0: ptp-timer@4fe000 {
reg = <0xfe000 0x1000>; compatible = "fsl,fman-ptp-timer";
}; reg = <0x4fe000 0x1000>;
interrupts = <96 2 0 0>;
}; };

16
arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi
View File

@ -37,12 +37,13 @@ fman1: fman@500000 {
#size-cells = <1>; #size-cells = <1>;
cell-index = <1>; cell-index = <1>;
compatible = "fsl,fman"; compatible = "fsl,fman";
ranges = <0 0x500000 0x100000>; ranges = <0 0x500000 0xfe000>;
reg = <0x500000 0x100000>; reg = <0x500000 0xfe000>;
interrupts = <97 2 0 0>, <16 2 1 0>; interrupts = <97 2 0 0>, <16 2 1 0>;
clocks = <&clockgen 3 1>; clocks = <&clockgen 3 1>;
clock-names = "fmanclk"; clock-names = "fmanclk";
fsl,qman-channel-range = <0x60 0xc>; fsl,qman-channel-range = <0x60 0xc>;
ptimer-handle = <&ptp_timer1>;
muram@0 { muram@0 {
compatible = "fsl,fman-muram"; compatible = "fsl,fman-muram";
@ -93,9 +94,10 @@ fman1: fman@500000 {
reg = <0x87000 0x1000>; reg = <0x87000 0x1000>;
status = "disabled"; status = "disabled";
}; };
};
ptp_timer1: ptp-timer@fe000 {
compatible = "fsl,fman-ptp-timer"; ptp_timer1: ptp-timer@5fe000 {
reg = <0xfe000 0x1000>; compatible = "fsl,fman-ptp-timer";
}; reg = <0x5fe000 0x1000>;
interrupts = <97 2 0 0>;
}; };

16
arch/powerpc/boot/dts/fsl/qoriq-fman3-0.dtsi
View File

@ -37,12 +37,13 @@ fman0: fman@400000 {
#size-cells = <1>; #size-cells = <1>;
cell-index = <0>; cell-index = <0>;
compatible = "fsl,fman"; compatible = "fsl,fman";
ranges = <0 0x400000 0x100000>; ranges = <0 0x400000 0xfe000>;
reg = <0x400000 0x100000>; reg = <0x400000 0xfe000>;
interrupts = <96 2 0 0>, <16 2 1 1>; interrupts = <96 2 0 0>, <16 2 1 1>;
clocks = <&clockgen 3 0>; clocks = <&clockgen 3 0>;
clock-names = "fmanclk"; clock-names = "fmanclk";
fsl,qman-channel-range = <0x800 0x10>; fsl,qman-channel-range = <0x800 0x10>;
ptimer-handle = <&ptp_timer0>;
muram@0 { muram@0 {
compatible = "fsl,fman-muram"; compatible = "fsl,fman-muram";
@ -98,9 +99,10 @@ fman0: fman@400000 {
compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
reg = <0xfd000 0x1000>; reg = <0xfd000 0x1000>;
}; };
};
ptp_timer0: ptp-timer@fe000 {
compatible = "fsl,fman-ptp-timer"; ptp_timer0: ptp-timer@4fe000 {
reg = <0xfe000 0x1000>; compatible = "fsl,fman-ptp-timer";
}; reg = <0x4fe000 0x1000>;
interrupts = <96 2 0 0>;
}; };

16
arch/powerpc/boot/dts/fsl/qoriq-fman3-1.dtsi
View File

@ -37,12 +37,13 @@ fman1: fman@500000 {
#size-cells = <1>; #size-cells = <1>;
cell-index = <1>; cell-index = <1>;
compatible = "fsl,fman"; compatible = "fsl,fman";
ranges = <0 0x500000 0x100000>; ranges = <0 0x500000 0xfe000>;
reg = <0x500000 0x100000>; reg = <0x500000 0xfe000>;
interrupts = <97 2 0 0>, <16 2 1 0>; interrupts = <97 2 0 0>, <16 2 1 0>;
clocks = <&clockgen 3 1>; clocks = <&clockgen 3 1>;
clock-names = "fmanclk"; clock-names = "fmanclk";
fsl,qman-channel-range = <0x820 0x10>; fsl,qman-channel-range = <0x820 0x10>;
ptimer-handle = <&ptp_timer1>;
muram@0 { muram@0 {
compatible = "fsl,fman-muram"; compatible = "fsl,fman-muram";
@ -98,9 +99,10 @@ fman1: fman@500000 {
compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
reg = <0xfd000 0x1000>; reg = <0xfd000 0x1000>;
}; };
};
ptp_timer1: ptp-timer@fe000 {
compatible = "fsl,fman-ptp-timer"; ptp_timer1: ptp-timer@5fe000 {
reg = <0xfe000 0x1000>; compatible = "fsl,fman-ptp-timer";
}; reg = <0x5fe000 0x1000>;
interrupts = <97 2 0 0>;
}; };

16
arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi
View File

@ -37,12 +37,13 @@ fman0: fman@400000 {
#size-cells = <1>; #size-cells = <1>;
cell-index = <0>; cell-index = <0>;
compatible = "fsl,fman"; compatible = "fsl,fman";
ranges = <0 0x400000 0x100000>; ranges = <0 0x400000 0xfe000>;
reg = <0x400000 0x100000>; reg = <0x400000 0xfe000>;
interrupts = <96 2 0 0>, <16 2 1 1>; interrupts = <96 2 0 0>, <16 2 1 1>;
clocks = <&clockgen 3 0>; clocks = <&clockgen 3 0>;
clock-names = "fmanclk"; clock-names = "fmanclk";
fsl,qman-channel-range = <0x800 0x10>; fsl,qman-channel-range = <0x800 0x10>;
ptimer-handle = <&ptp_timer0>;
muram@0 { muram@0 {
compatible = "fsl,fman-muram"; compatible = "fsl,fman-muram";
@ -86,9 +87,10 @@ fman0: fman@400000 {
compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
reg = <0xfd000 0x1000>; reg = <0xfd000 0x1000>;
}; };
};
ptp_timer0: ptp-timer@fe000 {
compatible = "fsl,fman-ptp-timer"; ptp_timer0: ptp-timer@4fe000 {
reg = <0xfe000 0x1000>; compatible = "fsl,fman-ptp-timer";
}; reg = <0x4fe000 0x1000>;
interrupts = <96 2 0 0>;
}; };