niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

net: mvpp2: use device_*/fwnode_* APIs instead of of_*

Browse source 
OF functions can be used only for the driver using DT.
As a preparation for introducing ACPI support in mvpp2
driver, use struct fwnode_handle in order to obtain
properties from the hardware description.

This patch replaces of_* function with device_*/fwnode_*
where possible in the mvpp2.

Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Marcin Wojtas 2018-01-18 13:31:43 +01:00 • committed by David S. Miller
parent bf147153d7
commit 248122212f
1 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
drivers/net/ethernet/marvell/mvpp2.c
View file

@ -932,6 +932,9 @@ struct mvpp2_port {
struct mvpp2 *priv; struct mvpp2 *priv;
/* Firmware node associated to the port */
struct fwnode_handle *fwnode;
/* Per-port registers' base address */ /* Per-port registers' base address */
void __iomem *base; void __iomem *base;
void __iomem *stats_base; void __iomem *stats_base;
@ -7711,17 +7714,16 @@ static bool mvpp2_port_has_tx_irqs(struct mvpp2 *priv,
} }
static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv, static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv,
struct device_node *port_node, struct fwnode_handle *fwnode,
char **mac_from) char **mac_from)
{ {
struct mvpp2_port *port = netdev_priv(dev); struct mvpp2_port *port = netdev_priv(dev);
char hw_mac_addr[ETH_ALEN] = {0}; char hw_mac_addr[ETH_ALEN] = {0};
const char *dt_mac_addr; char fw_mac_addr[ETH_ALEN];
dt_mac_addr = of_get_mac_address(port_node); if (fwnode_get_mac_address(fwnode, fw_mac_addr, ETH_ALEN)) {
if (dt_mac_addr && is_valid_ether_addr(dt_mac_addr)) { *mac_from = "firmware node";
*mac_from = "device tree"; ether_addr_copy(dev->dev_addr, fw_mac_addr);
ether_addr_copy(dev->dev_addr, dt_mac_addr);
return; return;
} }
@ -7740,13 +7742,14 @@ static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv,
/* Ports initialization */ /* Ports initialization */
static int mvpp2_port_probe(struct platform_device *pdev, static int mvpp2_port_probe(struct platform_device *pdev,
struct device_node *port_node, struct fwnode_handle *port_fwnode,
struct mvpp2 *priv) struct mvpp2 *priv)
{ {
struct device_node *phy_node; struct device_node *phy_node;
struct phy *comphy; struct phy *comphy;
struct mvpp2_port *port; struct mvpp2_port *port;
struct mvpp2_port_pcpu *port_pcpu; struct mvpp2_port_pcpu *port_pcpu;
struct device_node *port_node = to_of_node(port_fwnode);
struct net_device *dev; struct net_device *dev;
struct resource *res; struct resource *res;
char *mac_from = ""; char *mac_from = "";
@ -7773,7 +7776,7 @@ static int mvpp2_port_probe(struct platform_device *pdev,
return -ENOMEM; return -ENOMEM;
phy_node = of_parse_phandle(port_node, "phy", 0); phy_node = of_parse_phandle(port_node, "phy", 0);
phy_mode = of_get_phy_mode(port_node); phy_mode = fwnode_get_phy_mode(port_fwnode);
if (phy_mode < 0) { if (phy_mode < 0) {
dev_err(&pdev->dev, "incorrect phy mode\n"); dev_err(&pdev->dev, "incorrect phy mode\n");
err = phy_mode; err = phy_mode;
@ -7789,7 +7792,7 @@ static int mvpp2_port_probe(struct platform_device *pdev,
comphy = NULL; comphy = NULL;
} }
if (of_property_read_u32(port_node, "port-id", &id)) { if (fwnode_property_read_u32(port_fwnode, "port-id", &id)) {
err = -EINVAL; err = -EINVAL;
dev_err(&pdev->dev, "missing port-id value\n"); dev_err(&pdev->dev, "missing port-id value\n");
goto err_free_netdev; goto err_free_netdev;
@ -7820,7 +7823,7 @@ static int mvpp2_port_probe(struct platform_device *pdev,
/* the link irq is optional */ /* the link irq is optional */
port->link_irq = 0; port->link_irq = 0;
if (of_property_read_bool(port_node, "marvell,loopback")) if (fwnode_property_read_bool(port_fwnode, "marvell,loopback"))
port->flags |= MVPP2_F_LOOPBACK; port->flags |= MVPP2_F_LOOPBACK;
port->id = id; port->id = id;
@ -7845,7 +7848,7 @@ static int mvpp2_port_probe(struct platform_device *pdev,
MVPP21_MIB_COUNTERS_OFFSET + MVPP21_MIB_COUNTERS_OFFSET +
port->gop_id * MVPP21_MIB_COUNTERS_PORT_SZ; port->gop_id * MVPP21_MIB_COUNTERS_PORT_SZ;
} else { } else {
if (of_property_read_u32(port_node, "gop-port-id", if (fwnode_property_read_u32(port_fwnode, "gop-port-id",
&port->gop_id)) { &port->gop_id)) {
err = -EINVAL; err = -EINVAL;
dev_err(&pdev->dev, "missing gop-port-id value\n"); dev_err(&pdev->dev, "missing gop-port-id value\n");
@ -7876,7 +7879,7 @@ static int mvpp2_port_probe(struct platform_device *pdev,
mutex_init(&port->gather_stats_lock); mutex_init(&port->gather_stats_lock);
INIT_DELAYED_WORK(&port->stats_work, mvpp2_gather_hw_statistics); INIT_DELAYED_WORK(&port->stats_work, mvpp2_gather_hw_statistics);
mvpp2_port_copy_mac_addr(dev, priv, port_node, &mac_from); mvpp2_port_copy_mac_addr(dev, priv, port_fwnode, &mac_from);
port->tx_ring_size = MVPP2_MAX_TXD_DFLT; port->tx_ring_size = MVPP2_MAX_TXD_DFLT;
port->rx_ring_size = MVPP2_MAX_RXD_DFLT; port->rx_ring_size = MVPP2_MAX_RXD_DFLT;
@ -8194,8 +8197,8 @@ static int mvpp2_init(struct platform_device *pdev, struct mvpp2 *priv)
static int mvpp2_probe(struct platform_device *pdev) static int mvpp2_probe(struct platform_device *pdev)
{ {
struct device_node *dn = pdev->dev.of_node; struct fwnode_handle *fwnode = pdev->dev.fwnode;
struct device_node *port_node; struct fwnode_handle *port_fwnode;
struct mvpp2 *priv; struct mvpp2 *priv;
struct resource *res; struct resource *res;
void __iomem *base; void __iomem *base;
@ -8315,8 +8318,8 @@ static int mvpp2_probe(struct platform_device *pdev)
} }
/* Initialize ports */ /* Initialize ports */
for_each_available_child_of_node(dn, port_node) { fwnode_for_each_available_child_node(fwnode, port_fwnode) {
err = mvpp2_port_probe(pdev, port_node, priv); err = mvpp2_port_probe(pdev, port_fwnode, priv);
if (err < 0) if (err < 0)
goto err_port_probe; goto err_port_probe;
} }
@ -8347,7 +8350,7 @@ static int mvpp2_probe(struct platform_device *pdev)
err_port_probe: err_port_probe:
i = 0; i = 0;
for_each_available_child_of_node(dn, port_node) { fwnode_for_each_available_child_node(fwnode, port_fwnode) {
if (priv->port_list[i]) if (priv->port_list[i])
mvpp2_port_remove(priv->port_list[i]); mvpp2_port_remove(priv->port_list[i]);
i++; i++;
@ -8366,14 +8369,14 @@ err_pp_clk:
static int mvpp2_remove(struct platform_device *pdev) static int mvpp2_remove(struct platform_device *pdev)
{ {
struct mvpp2 *priv = platform_get_drvdata(pdev); struct mvpp2 *priv = platform_get_drvdata(pdev);
struct device_node *dn = pdev->dev.of_node; struct fwnode_handle *fwnode = pdev->dev.fwnode;
struct device_node *port_node; struct fwnode_handle *port_fwnode;
int i = 0; int i = 0;
flush_workqueue(priv->stats_queue); flush_workqueue(priv->stats_queue);
destroy_workqueue(priv->stats_queue); destroy_workqueue(priv->stats_queue);
for_each_available_child_of_node(dn, port_node) { fwnode_for_each_available_child_node(fwnode, port_fwnode) {
if (priv->port_list[i]) { if (priv->port_list[i]) {
mutex_destroy(&priv->port_list[i]->gather_stats_lock); mutex_destroy(&priv->port_list[i]->gather_stats_lock);
mvpp2_port_remove(priv->port_list[i]); mvpp2_port_remove(priv->port_list[i]);