diff mbox

[U-Boot,PATCHv2,06/10] net: mvpp2x: remove MBUS configurations from MvPP22 driver

Message ID 1502264272-27773-7-git-send-email-stefanc@marvell.com
State Awaiting Upstream
Delegated to: Stefan Roese
Headers show

Commit Message

Stefan Chulski Aug. 9, 2017, 7:37 a.m. UTC 
From: Stefan Chulski <stefanc@marvell.com>

MBUS driver were replaced by AXI in PPv22 and relevant
only for PPv21.

Signed-off-by: Stefan Chulski <stefanc@marvell.com>
Tested-by: iSoC Platform CI <ykjenk@marvell.com>
Reviewed-by: Nadav Haklai <nadavh@marvell.com>
Reviewed-by: Igal Liberman <igall@marvell.com>
---
 drivers/net/mvpp2.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Comments

Joe Hershberger Aug. 9, 2017, 3:35 p.m. UTC | #1 
On Wed, Aug 9, 2017 at 2:37 AM,  <stefanc@marvell.com> wrote:
> From: Stefan Chulski <stefanc@marvell.com>
>
> MBUS driver were replaced by AXI in PPv22 and relevant
> only for PPv21.
>
> Signed-off-by: Stefan Chulski <stefanc@marvell.com>
> Tested-by: iSoC Platform CI <ykjenk@marvell.com>
> Reviewed-by: Nadav Haklai <nadavh@marvell.com>
> Reviewed-by: Igal Liberman <igall@marvell.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
diff mbox

Patch

diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index 355eb39..2e5a194 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -5014,13 +5014,14 @@  static int mvpp2_init(struct udevice *dev, struct mvpp2 *priv)
 		return -EINVAL;
 	}
 
-	/* MBUS windows configuration */
-	dram_target_info = mvebu_mbus_dram_info();
-	if (dram_target_info)
-		mvpp2_conf_mbus_windows(dram_target_info, priv);
-
 	if (priv->hw_version == MVPP22)
 		mvpp2_axi_init(priv);
+	else {
+		/* MBUS windows configuration */
+		dram_target_info = mvebu_mbus_dram_info();
+		if (dram_target_info)
+			mvpp2_conf_mbus_windows(dram_target_info, priv);
+	}
 
 	if (priv->hw_version == MVPP21) {
 		/* Disable HW PHY polling */