Thread (3 messages) 3 messages, 2 authors, 2015-09-09

Re: [PATCH v3] powerpc/dts: Add and fix 1588 timer node for eTSEC

From: Scott Wood <hidden>
Date: 2015-09-09 21:25:51
Also in: lkml 

On Mon, 2015-09-07 at 01:57 -0500, Lu Yangbo-B47093 wrote:
Any comments?

-Yangbo Lu
Sorry, this somehow got marked as Awaiting Upstream in patchwork but not 
applied to my tree.  I'll take it next time.

-Scott


quoted
-----Original Message-----
From: Yangbo Lu [mailto:yangbo.lu@freescale.com]
Sent: Wednesday, July 29, 2015 3:13 PM
To: linuxppc-dev@lists.ozlabs.org; linux-kernel@vger.kernel.org; Wood
Scott-B07421
Cc: Lu Yangbo-B47093
Subject: [PATCH v3] powerpc/dts: Add and fix 1588 timer node for eTSEC

Add 1588 timer node in files:
arch/powerpc/boot/dts/bsc9131rdb.dtsi
arch/powerpc/boot/dts/bsc9132qds.dtsi
arch/powerpc/boot/dts/p1010rdb.dtsi
arch/powerpc/boot/dts/p1020rdb-pd.dts
arch/powerpc/boot/dts/p1021rdb-pc.dtsi
arch/powerpc/boot/dts/p1022ds.dtsi
arch/powerpc/boot/dts/p1025twr.dtsi
For P2020RDB-PC, registers' values should be calculated based on default
1588 reference clock(300MHz) not 250MHz, and fix this in file:
arch/powerpc/boot/dts/p2020rdb-pc.dtsi

Signed-off-by: Yangbo Lu <redacted>
---
Changes for v3:
    - Changed 'tmr-add' to hex value
    - Modified commit message
Changes for v2:
    - Changed hex value to decimal value in dts
    - Modified commit message
    - Modified 1588 node in p2020rdb-pc.dtsi
---
 arch/powerpc/boot/dts/bsc9131rdb.dtsi  | 12 ++++++++++++
arch/powerpc/boot/dts/bsc9132qds.dtsi  | 12 ++++++++++++
 arch/powerpc/boot/dts/p1010rdb.dtsi    | 12 ++++++++++++
 arch/powerpc/boot/dts/p1020rdb-pd.dts  | 12 ++++++++++++
arch/powerpc/boot/dts/p1021rdb-pc.dtsi | 12 ++++++++++++
 arch/powerpc/boot/dts/p1022ds.dtsi     | 12 ++++++++++++
 arch/powerpc/boot/dts/p1025twr.dtsi    | 12 ++++++++++++
 arch/powerpc/boot/dts/p2020rdb-pc.dtsi | 12 ++++++------
 8 files changed, 90 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/boot/dts/bsc9131rdb.dtsi
b/arch/powerpc/boot/dts/bsc9131rdb.dtsi
index 45efcba..f4d96d2 100644
--- a/arch/powerpc/boot/dts/bsc9131rdb.dtsi
+++ b/arch/powerpc/boot/dts/bsc9131rdb.dtsi
@@ -80,6 +80,18 @@
            status = "disabled";
    };

+    ptp_clock@b0e00{
+           compatible = "fsl,etsec-ptp";
+           reg = <0xb0e00 0xb0>;
+           interrupts = <68 2 0 0 69 2 0 0>;
+           fsl,tclk-period = <5>;
+           fsl,tmr-prsc    = <2>;
+           fsl,tmr-add     = <0xcccccccd>;
+           fsl,tmr-fiper1  = <999999995>;
+           fsl,tmr-fiper2  = <99990>;
+           fsl,max-adj     = <249999999>;
+   };
+
    enet0:  ethernet@b0000{
            phy-handle = <&phy0>;
            phy-connection-type = "rgmii-id";
diff --git a/arch/powerpc/boot/dts/bsc9132qds.dtsi
b/arch/powerpc/boot/dts/bsc9132qds.dtsi
index af8e888..7a13bf2 100644
--- a/arch/powerpc/boot/dts/bsc9132qds.dtsi
+++ b/arch/powerpc/boot/dts/bsc9132qds.dtsi
@@ -87,6 +87,18 @@
            };
    };

+    ptp_clock@b0e00{
+           compatible = "fsl,etsec-ptp";
+           reg = <0xb0e00 0xb0>;
+           interrupts = <68 2 0 0 69 2 0 0>;
+           fsl,tclk-period = <5>;
+           fsl,tmr-prsc    = <2>;
+           fsl,tmr-add     = <0xcccccccd>;
+           fsl,tmr-fiper1  = <999999995>;
+           fsl,tmr-fiper2  = <99990>;
+           fsl,max-adj     = <249999999>;
+   };
+
    enet0:  ethernet@b0000{
            phy-handle = <&phy0>;
            tbi-handle = <&tbi0>;
diff --git a/arch/powerpc/boot/dts/p1010rdb.dtsi
b/arch/powerpc/boot/dts/p1010rdb.dtsi
index ea534ef..0f0ced6 100644
--- a/arch/powerpc/boot/dts/p1010rdb.dtsi
+++ b/arch/powerpc/boot/dts/p1010rdb.dtsi
@@ -186,6 +186,18 @@
            };
    };

+    ptp_clock@b0e00{
+           compatible = "fsl,etsec-ptp";
+           reg = <0xb0e00 0xb0>;
+           interrupts = <68 2 0 0 69 2 0 0>;
+           fsl,tclk-period = <10>;
+           fsl,tmr-prsc    = <2>;
+           fsl,tmr-add     = <0x80000016>;
+           fsl,tmr-fiper1  = <999999990>;
+           fsl,tmr-fiper2  = <99990>;
+           fsl,max-adj     = <199999999>;
+   };
+
    enet0:  ethernet@b0000{
            phy-handle = <&phy0>;
            phy-connection-type = "rgmii-id";
diff --git a/arch/powerpc/boot/dts/p1020rdb-pd.dts
b/arch/powerpc/boot/dts/p1020rdb-pd.dts
index 987017e..c7c6416 100644
--- a/arch/powerpc/boot/dts/p1020rdb-pd.dts
+++ b/arch/powerpc/boot/dts/p1020rdb-pd.dts
@@ -225,6 +225,18 @@
                    };
            };

+            ptp_clock@b0e00{
+                   compatible = "fsl,etsec-ptp";
+                   reg = <0xb0e00 0xb0>;
+                   interrupts = <68 2 0 0 69 2 0 0>;
+                   fsl,tclk-period = <10>;
+                   fsl,tmr-prsc    = <2>;
+                   fsl,tmr-add     = <0x80000016>;
+                   fsl,tmr-fiper1  = <999999990>;
+                   fsl,tmr-fiper2  = <99990>;
+                   fsl,max-adj     = <199999999>;
+           };
+
            enet0:  ethernet@b0000{
                    fixed-link = <1 1 1000 0 0>;
                    phy-connection-type = "rgmii-id";
diff --git a/arch/powerpc/boot/dts/p1021rdb-pc.dtsi
b/arch/powerpc/boot/dts/p1021rdb-pc.dtsi
index d6274c5..e8a0f95 100644
--- a/arch/powerpc/boot/dts/p1021rdb-pc.dtsi
+++ b/arch/powerpc/boot/dts/p1021rdb-pc.dtsi
@@ -224,6 +224,18 @@
            };
    };

+    ptp_clock@b0e00{
+           compatible = "fsl,etsec-ptp";
+           reg = <0xb0e00 0xb0>;
+           interrupts = <68 2 0 0 69 2 0 0>;
+           fsl,tclk-period = <10>;
+           fsl,tmr-prsc    = <2>;
+           fsl,tmr-add     = <0x80000016>;
+           fsl,tmr-fiper1  = <999999990>;
+           fsl,tmr-fiper2  = <99990>;
+           fsl,max-adj     = <199999999>;
+   };
+
    enet0:  ethernet@b0000{
            fixed-link = <1 1 1000 0 0>;
            phy-connection-type = "rgmii-id";
diff --git a/arch/powerpc/boot/dts/p1022ds.dtsi
b/arch/powerpc/boot/dts/p1022ds.dtsi
index 957e0dc..149da0f 100644
--- a/arch/powerpc/boot/dts/p1022ds.dtsi
+++ b/arch/powerpc/boot/dts/p1022ds.dtsi
@@ -215,6 +215,18 @@
            };
    };

+    ptp_clock@b0e00{
+           compatible = "fsl,etsec-ptp";
+           reg = <0xb0e00 0xb0>;
+           interrupts = <68 2 0 0 69 2 0 0>;
+           fsl,tclk-period = <5>;
+           fsl,tmr-prsc    = <2>;
+           fsl,tmr-add     = <0xc01ebd3d>;
+           fsl,tmr-fiper1  = <999999995>;
+           fsl,tmr-fiper2  = <99990>;
+           fsl,max-adj     = <266499999>;
+   };
+
     ethernet@b0000{
            phy-handle = <&phy0>;
            phy-connection-type = "rgmii-id";
diff --git a/arch/powerpc/boot/dts/p1025twr.dtsi
b/arch/powerpc/boot/dts/p1025twr.dtsi
index 8453501..08816fb 100644
--- a/arch/powerpc/boot/dts/p1025twr.dtsi
+++ b/arch/powerpc/boot/dts/p1025twr.dtsi
@@ -138,6 +138,18 @@
            };
    };

+    ptp_clock@b0e00{
+           compatible = "fsl,etsec-ptp";
+           reg = <0xb0e00 0xb0>;
+           interrupts = <68 2 0 0 69 2 0 0>;
+           fsl,tclk-period = <10>;
+           fsl,tmr-prsc    = <2>;
+           fsl,tmr-add     = <0xc0000021>;
+           fsl,tmr-fiper1  = <999999990>;
+           fsl,tmr-fiper2  = <99990>;
+           fsl,max-adj     = <133333332>;
+   };
+
    enet0:  ethernet@b0000{
            phy-handle = <&phy0>;
            phy-connection-type = "rgmii-id";
diff --git a/arch/powerpc/boot/dts/p2020rdb-pc.dtsi
b/arch/powerpc/boot/dts/p2020rdb-pc.dtsi
index c21d1c7..ad2e242 100644
--- a/arch/powerpc/boot/dts/p2020rdb-pc.dtsi
+++ b/arch/powerpc/boot/dts/p2020rdb-pc.dtsi
@@ -215,12 +215,12 @@
    };

     ptp_clock@24e00{
-           fsl,tclk-period = <5>;
-           fsl,tmr-prsc = <200>;
-           fsl,tmr-add = <0xCCCCCCCD>;
-           fsl,tmr-fiper1 = <0x3B9AC9FB>;
-           fsl,tmr-fiper2 = <0x0001869B>;
-           fsl,max-adj = <249999999>;
+           fsl,tclk-period = <5>;
+           fsl,tmr-prsc    = <2>;
+           fsl,tmr-add     = <0xaaaaaaab>;
+           fsl,tmr-fiper1  = <999999995>;
+           fsl,tmr-fiper2  = <99990>;
+           fsl,max-adj     = <299999999>;
    };

    enet0:  ethernet@24000{
--
2.1.0.27.g96db324
  



    
  

  
    

      

        Keyboard shortcuts
      

      

        
          
hback out one level

          
jnext message in thread

          
kprevious message in thread

          
ldrill in

          
Escclose help / fold thread tree

          
?toggle this help