Commit 229f4bb4 authored by Calvin Johnson's avatar Calvin Johnson Committed by David S. Miller

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: default avatarJeremy Linton <jeremy.linton@arm.com>
Signed-off-by: default avatarCalvin Johnson <calvin.johnson@oss.nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0cc8fecf
...@@ -245,14 +245,19 @@ static int xgmac_mdio_probe(struct platform_device *pdev) ...@@ -245,14 +245,19 @@ static int xgmac_mdio_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct mii_bus *bus; struct mii_bus *bus;
struct resource res; struct resource *res;
struct mdio_fsl_priv *priv; struct mdio_fsl_priv *priv;
int ret; int ret;
ret = of_address_to_resource(np, 0, &res); /* In DPAA-1, MDIO is one of the many FMan sub-devices. The FMan
if (ret) { * 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"); dev_err(&pdev->dev, "could not obtain address\n");
return ret; return -EINVAL;
} }
bus = mdiobus_alloc_size(sizeof(struct mdio_fsl_priv)); bus = mdiobus_alloc_size(sizeof(struct mdio_fsl_priv));
...@@ -263,21 +268,21 @@ static int xgmac_mdio_probe(struct platform_device *pdev) ...@@ -263,21 +268,21 @@ static int xgmac_mdio_probe(struct platform_device *pdev)
bus->read = xgmac_mdio_read; bus->read = xgmac_mdio_read;
bus->write = xgmac_mdio_write; bus->write = xgmac_mdio_write;
bus->parent = &pdev->dev; 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 */ /* Set the PHY base address */
priv = bus->priv; priv = bus->priv;
priv->mdio_base = of_iomap(np, 0); priv->mdio_base = ioremap(res->start, resource_size(res));
if (!priv->mdio_base) { if (!priv->mdio_base) {
ret = -ENOMEM; ret = -ENOMEM;
goto err_ioremap; goto err_ioremap;
} }
priv->is_little_endian = of_property_read_bool(pdev->dev.of_node, priv->is_little_endian = device_property_read_bool(&pdev->dev,
"little-endian"); "little-endian");
priv->has_a011043 = of_property_read_bool(pdev->dev.of_node, priv->has_a011043 = device_property_read_bool(&pdev->dev,
"fsl,erratum-a011043"); "fsl,erratum-a011043");
ret = of_mdiobus_register(bus, np); ret = of_mdiobus_register(bus, np);
if (ret) { if (ret) {
...@@ -320,10 +325,17 @@ static const struct of_device_id xgmac_mdio_match[] = { ...@@ -320,10 +325,17 @@ static const struct of_device_id xgmac_mdio_match[] = {
}; };
MODULE_DEVICE_TABLE(of, 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 = { static struct platform_driver xgmac_mdio_driver = {
.driver = { .driver = {
.name = "fsl-fman_xmdio", .name = "fsl-fman_xmdio",
.of_match_table = xgmac_mdio_match, .of_match_table = xgmac_mdio_match,
.acpi_match_table = xgmac_acpi_match,
}, },
.probe = xgmac_mdio_probe, .probe = xgmac_mdio_probe,
.remove = xgmac_mdio_remove, .remove = xgmac_mdio_remove,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment