Message ID | 1498033898-15650-7-git-send-email-stefanc@malvell.com |
---|---|
State | Superseded |
Delegated to: | Stefan Roese |
Headers | show |
On Wed, Jun 21, 2017 at 3:31 AM, <stefanc@malvell.com> wrote: > From: Stefan Chulski <stefanc@marvell.com> > > MBUS driver were replaced by AXI in PPv22 and relevant > only for PPv21. > > Change-Id: Iafb42f121d0ad2d8bc99a42e7ed671cd7b754b42 > Signed-off-by: Stefan Chulski <stefanc@marvell.com> > Reviewed-on: http://vgitil04.il.marvell.com:8080/39965 > Tested-by: iSoC Platform CI <ykjenk@marvell.com> > Reviewed-by: Nadav Haklai <nadavh@marvell.com> > Reviewed-on: http://vgitil04.il.marvell.com:8080/39951 > Reviewed-by: Igal Liberman <igall@marvell.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index 901e9d8..e74421f 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -5021,13 +5021,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 */