net: mvpp2: add support for an additional clock needed for PPv2.2

The PPv2.2 variant of the network controller needs an additional
clock, the "MG clock" in order for the IP block to operate
properly. This commit adds support for this additional clock to the
driver, reworking as needed the error handling path.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c
index 1bb1aa52618d84ac8dbb94dfd94686ff24209ae8..0a3c4701780958efc23be238b8e76778fac6465f 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
@@ -704,6 +704,7 @@ struct mvpp2 {
        /* Common clocks */
        struct clk *pp_clk;
        struct clk *gop_clk;
+       struct clk *mg_clk;
 
        /* List of pointers to port structures */
        struct mvpp2_port **port_list;
@@ -6925,6 +6926,18 @@ static int mvpp2_probe(struct platform_device *pdev)
        if (err < 0)
                goto err_pp_clk;
 
+       if (priv->hw_version == MVPP22) {
+               priv->mg_clk = devm_clk_get(&pdev->dev, "mg_clk");
+               if (IS_ERR(priv->mg_clk)) {
+                       err = PTR_ERR(priv->mg_clk);
+                       goto err_gop_clk;
+               }
+
+               err = clk_prepare_enable(priv->mg_clk);
+               if (err < 0)
+                       goto err_gop_clk;
+       }
+
        /* Get system's tclk rate */
        priv->tclk = clk_get_rate(priv->pp_clk);
 
@@ -6932,14 +6945,14 @@ static int mvpp2_probe(struct platform_device *pdev)
        err = mvpp2_init(pdev, priv);
        if (err < 0) {
                dev_err(&pdev->dev, "failed to initialize controller\n");
-               goto err_gop_clk;
+               goto err_mg_clk;
        }
 
        port_count = of_get_available_child_count(dn);
        if (port_count == 0) {
                dev_err(&pdev->dev, "no ports enabled\n");
                err = -ENODEV;
-               goto err_gop_clk;
+               goto err_mg_clk;
        }
 
        priv->port_list = devm_kcalloc(&pdev->dev, port_count,
@@ -6947,19 +6960,22 @@ static int mvpp2_probe(struct platform_device *pdev)
                                      GFP_KERNEL);
        if (!priv->port_list) {
                err = -ENOMEM;
-               goto err_gop_clk;
+               goto err_mg_clk;
        }
 
        /* Initialize ports */
        for_each_available_child_of_node(dn, port_node) {
                err = mvpp2_port_probe(pdev, port_node, priv);
                if (err < 0)
-                       goto err_gop_clk;
+                       goto err_mg_clk;
        }
 
        platform_set_drvdata(pdev, priv);
        return 0;
 
+err_mg_clk:
+       if (priv->hw_version == MVPP22)
+               clk_disable_unprepare(priv->mg_clk);
 err_gop_clk:
        clk_disable_unprepare(priv->gop_clk);
 err_pp_clk:
@@ -6995,6 +7011,7 @@ static int mvpp2_remove(struct platform_device *pdev)
                                  aggr_txq->descs_dma);
        }
 
+       clk_disable_unprepare(priv->mg_clk);
        clk_disable_unprepare(priv->pp_clk);
        clk_disable_unprepare(priv->gop_clk);