net: macb: TSU clock and PTP fixes

[zynq/linux.git] / drivers / net / ethernet / cadence / macb_main.c

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 0dc321fb7b6321d82ce831176de405ed06634d0a..0e00e679c3ad602a539679428ce845bd5d6856a6 100644 (file)
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -268,6 +268,9 @@ static void macb_set_hwaddr(struct macb *bp)
        top = cpu_to_le16(*((u16 *)(bp->dev->dev_addr + 4)));
        macb_or_gem_writel(bp, SA1T, top);
 
+       gem_writel(bp, RXPTPUNI, bottom);
+       gem_writel(bp, TXPTPUNI, bottom);
+
        /* Clear unused address register sets */
        macb_or_gem_writel(bp, SA2B, 0);
        macb_or_gem_writel(bp, SA2T, 0);
@@ -2213,7 +2216,8 @@ static void macb_init_hw(struct macb *bp)
                           gem_readl(bp, PCSCNTRL) | GEM_BIT(PCSAUTONEG));
 
        /* Enable TX and RX */
-       macb_writel(bp, NCR, MACB_BIT(RE) | MACB_BIT(TE) | MACB_BIT(MPE));
+       macb_writel(bp, NCR, MACB_BIT(RE) | MACB_BIT(TE) | MACB_BIT(MPE) |
+                   MACB_BIT(PTPUNI));
 }
 
 /* The hash address register is 64 bits long and takes up two
@@ -2965,7 +2969,7 @@ static void macb_probe_queues(void __iomem *mem,
 
 static int macb_clk_init(struct platform_device *pdev, struct clk **pclk,
                         struct clk **hclk, struct clk **tx_clk,
-                        struct clk **rx_clk)
+                        struct clk **rx_clk, struct clk **tsu_clk)
 {
        struct macb_platform_data *pdata;
        int err;
@@ -2999,6 +3003,10 @@ static int macb_clk_init(struct platform_device *pdev, struct clk **pclk,
        if (IS_ERR(*rx_clk))
                *rx_clk = NULL;
 
+       *tsu_clk = devm_clk_get(&pdev->dev, "tsu_clk");
+       if (IS_ERR(*tsu_clk))
+               *tsu_clk = NULL;
+
        err = clk_prepare_enable(*pclk);
        if (err) {
                dev_err(&pdev->dev, "failed to enable pclk (%u)\n", err);
@@ -3023,8 +3031,17 @@ static int macb_clk_init(struct platform_device *pdev, struct clk **pclk,
                goto err_disable_txclk;
        }
 
+       err = clk_prepare_enable(*tsu_clk);
+       if (err) {
+               dev_err(&pdev->dev, "failed to enable tsu_clk (%u)\n", err);
+               goto err_disable_rxclk;
+       }
+
        return 0;
 
+err_disable_rxclk:
+       clk_disable_unprepare(*rx_clk);
+
 err_disable_txclk:
        clk_disable_unprepare(*tx_clk);
 
@@ -3450,13 +3467,14 @@ static const struct net_device_ops at91ether_netdev_ops = {
 
 static int at91ether_clk_init(struct platform_device *pdev, struct clk **pclk,
                              struct clk **hclk, struct clk **tx_clk,
-                             struct clk **rx_clk)
+                             struct clk **rx_clk, struct clk **tsu_clk)
 {
        int err;
 
        *hclk = NULL;
        *tx_clk = NULL;
        *rx_clk = NULL;
+       *tsu_clk = NULL;
 
        *pclk = devm_clk_get(&pdev->dev, "ether_clk");
        if (IS_ERR(*pclk))
@@ -3583,13 +3601,14 @@ MODULE_DEVICE_TABLE(of, macb_dt_ids);
 static int macb_probe(struct platform_device *pdev)
 {
        int (*clk_init)(struct platform_device *, struct clk **,
-                       struct clk **, struct clk **,  struct clk **)
-                                             = macb_clk_init;
+                       struct clk **, struct clk **,  struct clk **,
+                       struct clk **) = macb_clk_init;
        int (*init)(struct platform_device *) = macb_init;
        struct device_node *np = pdev->dev.of_node;
        struct device_node *phy_node;
        const struct macb_config *macb_config = NULL;
        struct clk *pclk, *hclk = NULL, *tx_clk = NULL, *rx_clk = NULL;
+       struct clk *tsu_clk = NULL;
        unsigned int queue_mask, num_queues;
        struct macb_platform_data *pdata;
        bool native_io;
@@ -3617,7 +3636,7 @@ static int macb_probe(struct platform_device *pdev)
                }
        }
 
-       err = clk_init(pdev, &pclk, &hclk, &tx_clk, &rx_clk);
+       err = clk_init(pdev, &pclk, &hclk, &tx_clk, &rx_clk, &tsu_clk);
        if (err)
                return err;
 
@@ -3654,6 +3673,10 @@ static int macb_probe(struct platform_device *pdev)
        bp->hclk = hclk;
        bp->tx_clk = tx_clk;
        bp->rx_clk = rx_clk;
+       bp->tsu_clk = tsu_clk;
+       if (tsu_clk)
+               bp->tsu_rate = clk_get_rate(tsu_clk);
+
        if (macb_config)
                bp->jumbo_max_len = macb_config->jumbo_max_len;
 
@@ -3769,6 +3792,7 @@ err_disable_clocks:
        clk_disable_unprepare(hclk);
        clk_disable_unprepare(pclk);
        clk_disable_unprepare(rx_clk);
+       clk_disable_unprepare(tsu_clk);
 
        return err;
 }
@@ -3797,6 +3821,7 @@ static int macb_remove(struct platform_device *pdev)
                clk_disable_unprepare(bp->hclk);
                clk_disable_unprepare(bp->pclk);
                clk_disable_unprepare(bp->rx_clk);
+               clk_disable_unprepare(bp->tsu_clk);
                of_node_put(bp->phy_node);
                free_netdev(dev);
        }