net/fsl: acpize xgmac_mdio

Add ACPI support for xgmac MDIO bus registration while maintaining
the existing DT support.

The function mdiobus_register() inside of_mdiobus_register(), brings
up all the PHYs on the mdio bus and attach them to the bus.

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/xgmac_mdio.c b/drivers/net/ethernet/freescale/xgmac_mdio.c
index c82c85e..b4ed5f8 100644 (file)
--- a/drivers/net/ethernet/freescale/xgmac_mdio.c
+++ b/drivers/net/ethernet/freescale/xgmac_mdio.c
@@ -245,14 +245,19 @@ static int xgmac_mdio_probe(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
        struct mii_bus *bus;
-       struct resource res;
+       struct resource *res;
        struct mdio_fsl_priv *priv;
        int ret;
 
-       ret = of_address_to_resource(np, 0, &res);
-       if (ret) {
+       /* In DPAA-1, MDIO is one of the many FMan sub-devices. The FMan
+        * defines a register space that spans a large area, covering all the
+        * subdevice areas. Therefore, MDIO cannot claim exclusive access to
+        * this register area.
+        */
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res) {
                dev_err(&pdev->dev, "could not obtain address\n");
-               return ret;
+               return -EINVAL;
        }
 
        bus = mdiobus_alloc_size(sizeof(struct mdio_fsl_priv));
@@ -263,21 +268,21 @@ static int xgmac_mdio_probe(struct platform_device *pdev)
        bus->read = xgmac_mdio_read;
        bus->write = xgmac_mdio_write;
        bus->parent = &pdev->dev;
-       snprintf(bus->id, MII_BUS_ID_SIZE, "%llx", (unsigned long long)res.start);
+       snprintf(bus->id, MII_BUS_ID_SIZE, "%pa", &res->start);
 
        /* Set the PHY base address */
        priv = bus->priv;
-       priv->mdio_base = of_iomap(np, 0);
+       priv->mdio_base = ioremap(res->start, resource_size(res));
        if (!priv->mdio_base) {
                ret = -ENOMEM;
                goto err_ioremap;
        }
 
-       priv->is_little_endian = of_property_read_bool(pdev->dev.of_node,
-                                                      "little-endian");
+       priv->is_little_endian = device_property_read_bool(&pdev->dev,
+                                                          "little-endian");
 
-       priv->has_a011043 = of_property_read_bool(pdev->dev.of_node,
-                                                 "fsl,erratum-a011043");
+       priv->has_a011043 = device_property_read_bool(&pdev->dev,
+                                                     "fsl,erratum-a011043");
 
        ret = of_mdiobus_register(bus, np);
        if (ret) {
@@ -320,10 +325,17 @@ static const struct of_device_id xgmac_mdio_match[] = {
 };
 MODULE_DEVICE_TABLE(of, xgmac_mdio_match);
 
+static const struct acpi_device_id xgmac_acpi_match[] = {
+       { "NXP0006" },
+       { }
+};
+MODULE_DEVICE_TABLE(acpi, xgmac_acpi_match);
+
 static struct platform_driver xgmac_mdio_driver = {
        .driver = {
                .name = "fsl-fman_xmdio",
                .of_match_table = xgmac_mdio_match,
+               .acpi_match_table = xgmac_acpi_match,
        },
        .probe = xgmac_mdio_probe,
        .remove = xgmac_mdio_remove,