dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-07 11:42:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

net: mvpp2: Restructure probe / init functions

Browse Source 
This patch does a bit of restructuring of the probe / init functions,
mainly to allow earlier register access as it is needed for the upcoming
GoP (Group of Ports) and NetC (Net Complex) code.

Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Stefan Roese
2017-03-22 14:11:16 +01:00
parent d11e934746
commit 66b11ccbb6
1 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
drivers/net/mvpp2.c
View File

@@ -3823,19 +3823,14 @@ static int mvpp2_port_init(struct udevice *dev, struct mvpp2_port *port)
return 0; return 0;
} }
/* Ports initialization */ static int phy_info_parse(struct udevice *dev, struct mvpp2_port *port)
static int mvpp2_port_probe(struct udevice *dev,
struct mvpp2_port *port,
int port_node,
struct mvpp2 *priv)
{ {
int port_node = dev_of_offset(dev);
const char *phy_mode_str;
int phy_node; int phy_node;
u32 id; u32 id;
u32 phyaddr; u32 phyaddr;
const char *phy_mode_str;
int phy_mode = -1; int phy_mode = -1;
int priv_common_regs_num = 2;
int err;
phy_node = fdtdec_lookup_phandle(gd->fdt_blob, port_node, "phy"); phy_node = fdtdec_lookup_phandle(gd->fdt_blob, port_node, "phy");
if (phy_node < 0) { if (phy_node < 0) {
@@ -3859,46 +3854,37 @@ static int mvpp2_port_probe(struct udevice *dev,
phyaddr = fdtdec_get_int(gd->fdt_blob, phy_node, "reg", 0); phyaddr = fdtdec_get_int(gd->fdt_blob, phy_node, "reg", 0);
port->priv = priv;
port->id = id; port->id = id;
if (priv->hw_version == MVPP21) if (port->priv->hw_version == MVPP21)
port->first_rxq = port->id * rxq_number; port->first_rxq = port->id * rxq_number;
else else
port->first_rxq = port->id * priv->max_port_rxqs; port->first_rxq = port->id * port->priv->max_port_rxqs;
port->phy_node = phy_node; port->phy_node = phy_node;
port->phy_interface = phy_mode; port->phy_interface = phy_mode;
port->phyaddr = phyaddr; port->phyaddr = phyaddr;
if (priv->hw_version == MVPP21) { return 0;
port->base = (void __iomem *)dev_get_addr_index(
dev->parent, priv_common_regs_num + id);
if (IS_ERR(port->base))
return PTR_ERR(port->base);
} else {
u32 gop_id;
gop_id = fdtdec_get_int(gd->fdt_blob, port_node,
"gop-port-id", -1);
if (id == -1) {
dev_err(&pdev->dev, "missing gop-port-id value\n");
return -EINVAL;
} }
port->base = priv->iface_base + MVPP22_PORT_BASE + /* Ports initialization */
gop_id * MVPP22_PORT_OFFSET; static int mvpp2_port_probe(struct udevice *dev,
} struct mvpp2_port *port,
int port_node,
struct mvpp2 *priv)
{
int err;
port->tx_ring_size = MVPP2_MAX_TXD; port->tx_ring_size = MVPP2_MAX_TXD;
port->rx_ring_size = MVPP2_MAX_RXD; port->rx_ring_size = MVPP2_MAX_RXD;
err = mvpp2_port_init(dev, port); err = mvpp2_port_init(dev, port);
if (err < 0) { if (err < 0) {
dev_err(&pdev->dev, "failed to init port %d\n", id); dev_err(&pdev->dev, "failed to init port %d\n", port->id);
return err; return err;
} }
mvpp2_port_power_up(port); mvpp2_port_power_up(port);
priv->port_list[id] = port; priv->port_list[port->id] = port;
return 0; return 0;
} }
@@ -4546,6 +4532,36 @@ static int mvpp2_probe(struct udevice *dev)
err = mvpp2_base_probe(dev->parent); err = mvpp2_base_probe(dev->parent);
priv->probe_done = 1; priv->probe_done = 1;
} }
port->priv = dev_get_priv(dev->parent);
err = phy_info_parse(dev, port);
if (err)
return err;
/*
* We need the port specific io base addresses at this stage, since
* gop_port_init() accesses these registers
*/
if (priv->hw_version == MVPP21) {
int priv_common_regs_num = 2;
port->base = (void __iomem *)dev_get_addr_index(
dev->parent, priv_common_regs_num + port->id);
if (IS_ERR(port->base))
return PTR_ERR(port->base);
} else {
port->gop_id = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
"gop-port-id", -1);
if (port->id == -1) {
dev_err(&pdev->dev, "missing gop-port-id value\n");
return -EINVAL;
}
port->base = priv->iface_base + MVPP22_PORT_BASE +
port->gop_id * MVPP22_PORT_OFFSET;
}
/* Initialize network controller */ /* Initialize network controller */
err = mvpp2_init(dev, priv); err = mvpp2_init(dev, priv);
if (err < 0) { if (err < 0) {