x86: timer: tsc: Allow specifying clock rate from device tree again

[u-boot] / drivers / net / mvpp2.c

diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index a7077c7361a0cacf4a092b037aeeae88e5339b7d..62c0c2be0626d36608893467cfd406d76f4db6c5 100644 (file)
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -2675,7 +2675,7 @@ static int mvpp2_bm_pools_init(struct udevice *dev,
                err = mvpp2_bm_pool_create(dev, priv, bm_pool, size);
                if (err)
                        goto err_unroll_pools;
-               mvpp2_bm_pool_bufsize_set(priv, bm_pool, 0);
+               mvpp2_bm_pool_bufsize_set(priv, bm_pool, RX_BUFFER_SIZE);
        }
        return 0;
 
@@ -2861,9 +2861,6 @@ mvpp2_bm_pool_use(struct mvpp2_port *port, int pool, enum mvpp2_bm_type type,
                }
        }
 
-       mvpp2_bm_pool_bufsize_set(port->priv, new_pool,
-                                 MVPP2_RX_BUF_SIZE(new_pool->pkt_size));
-
        return new_pool;
 }
 
@@ -4725,7 +4722,7 @@ static int phy_info_parse(struct udevice *dev, struct mvpp2_port *port)
        u32 id;
        u32 phyaddr = 0;
        int phy_mode = -1;
-       u64 mdio_addr;
+       phys_addr_t mdio_addr;
 
        phy_node = fdtdec_lookup_phandle(gd->fdt_blob, port_node, "phy");
 
@@ -5601,6 +5598,10 @@ static int mvpp2_base_bind(struct udevice *parent)
                id += base_id_add;
 
                name = calloc(1, 16);
+               if (!name) {
+                       free(plat);
+                       return -ENOMEM;
+               }
                sprintf(name, "mvpp2-%d", id);
 
                /* Create child device UCLASS_ETH and bind it */