Merge branch 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ptp: Fix dp83640 build warning when building statically
  ptp: Added a clock driver for the National Semiconductor PHYTER.
  ptp: Added a clock driver for the IXP46x.
  ptp: Added a clock that uses the eTSEC found on the MPC85xx.
  ptp: Added a brand new class driver for ptp clocks.

4 files changed, 52 insertions, 0 deletions

diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index 761faa7b6964..ac1eb320c7b4 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -176,6 +176,19 @@
                         sleep = <&pmc 0x00300000>;
                 };
 
+                ptp_clock@24E00 {
+                        compatible = "fsl,etsec-ptp";
+                        reg = <0x24E00 0xB0>;
+                        interrupts = <12 0x8 13 0x8>;
+                        interrupt-parent = < &ipic >;
+                        fsl,tclk-period = <10>;
+                        fsl,tmr-prsc    = <100>;
+                        fsl,tmr-add     = <0x999999A4>;
+                        fsl,tmr-fiper1  = <0x3B9AC9F6>;
+                        fsl,tmr-fiper2  = <0x00018696>;
+                        fsl,max-adj     = <659999998>;
+                };
+
                 enet0: ethernet@24000 {
                         #address-cells = <1>;
                         #size-cells = <1>;
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts
index cafc1285c140..f6c04d25e916 100644
--- a/arch/powerpc/boot/dts/mpc8572ds.dts
+++ b/arch/powerpc/boot/dts/mpc8572ds.dts
@@ -324,6 +324,19 @@
                         };
                 };
 
+                ptp_clock@24E00 {
+                        compatible = "fsl,etsec-ptp";
+                        reg = <0x24E00 0xB0>;
+                        interrupts = <68 2 69 2 70 2 71 2>;
+                        interrupt-parent = < &mpic >;
+                        fsl,tclk-period = <5>;
+                        fsl,tmr-prsc = <200>;
+                        fsl,tmr-add = <0xAAAAAAAB>;
+                        fsl,tmr-fiper1 = <0x3B9AC9FB>;
+                        fsl,tmr-fiper2 = <0x3B9AC9FB>;
+                        fsl,max-adj = <499999999>;
+                };
+
                 enet0: ethernet@24000 {
                         #address-cells = <1>;
                         #size-cells = <1>;
diff --git a/arch/powerpc/boot/dts/p2020ds.dts b/arch/powerpc/boot/dts/p2020ds.dts
index 2bcf3683d223..dae403100f2f 100644
--- a/arch/powerpc/boot/dts/p2020ds.dts
+++ b/arch/powerpc/boot/dts/p2020ds.dts
@@ -178,6 +178,19 @@
 
                 };
 
+                ptp_clock@24E00 {
+                        compatible = "fsl,etsec-ptp";
+                        reg = <0x24E00 0xB0>;
+                        interrupts = <68 2 69 2 70 2>;
+                        interrupt-parent = < &mpic >;
+                        fsl,tclk-period = <5>;
+                        fsl,tmr-prsc = <200>;
+                        fsl,tmr-add = <0xCCCCCCCD>;
+                        fsl,tmr-fiper1 = <0x3B9AC9FB>;
+                        fsl,tmr-fiper2 = <0x0001869B>;
+                        fsl,max-adj = <249999999>;
+                };
+
                 enet0: ethernet@24000 {
                         tbi-handle = <&tbi0>;
                         phy-handle = <&phy0>;
diff --git a/arch/powerpc/boot/dts/p2020rdb.dts b/arch/powerpc/boot/dts/p2020rdb.dts
index 3782a58f13be..1d7a05f3021e 100644
--- a/arch/powerpc/boot/dts/p2020rdb.dts
+++ b/arch/powerpc/boot/dts/p2020rdb.dts
@@ -224,6 +224,19 @@
                         status = "disabled";
                 };
 
+                ptp_clock@24E00 {
+                        compatible = "fsl,etsec-ptp";
+                        reg = <0x24E00 0xB0>;
+                        interrupts = <68 2 69 2 70 2>;
+                        interrupt-parent = < &mpic >;
+                        fsl,tclk-period = <5>;
+                        fsl,tmr-prsc = <200>;
+                        fsl,tmr-add = <0xCCCCCCCD>;
+                        fsl,tmr-fiper1 = <0x3B9AC9FB>;
+                        fsl,tmr-fiper2 = <0x0001869B>;
+                        fsl,max-adj = <249999999>;
+                };
+
                 enet0: ethernet@24000 {
                         fixed-link = <1 1 1000 0 0>;
                         phy-connection-type = "rgmii-id";