Commit c54da4c1 authored by Marcin Wojtas's avatar Marcin Wojtas Committed by David S. Miller

net: mvmdio: add ACPI support

This patch introducing ACPI support for the mvmdio driver by adding
acpi_match_table with two entries:

* "MRVL0100" for the SMI operation
* "MRVL0101" for the XSMI mode
Signed-off-by: default avatarMarcin Wojtas <mw@semihalf.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 33fc11f0
...@@ -17,8 +17,10 @@ ...@@ -17,8 +17,10 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <linux/acpi.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/fwnode_mdio.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -281,7 +283,7 @@ static int orion_mdio_probe(struct platform_device *pdev) ...@@ -281,7 +283,7 @@ static int orion_mdio_probe(struct platform_device *pdev)
struct orion_mdio_dev *dev; struct orion_mdio_dev *dev;
int i, ret; int i, ret;
type = (enum orion_mdio_bus_type)of_device_get_match_data(&pdev->dev); type = (enum orion_mdio_bus_type)device_get_match_data(&pdev->dev);
r = platform_get_resource(pdev, IORESOURCE_MEM, 0); r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!r) { if (!r) {
...@@ -369,7 +371,7 @@ static int orion_mdio_probe(struct platform_device *pdev) ...@@ -369,7 +371,7 @@ static int orion_mdio_probe(struct platform_device *pdev)
goto out_mdio; goto out_mdio;
} }
ret = of_mdiobus_register(bus, pdev->dev.of_node); ret = fwnode_mdiobus_register(bus, pdev->dev.fwnode);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Cannot register MDIO bus (%d)\n", ret); dev_err(&pdev->dev, "Cannot register MDIO bus (%d)\n", ret);
goto out_mdio; goto out_mdio;
...@@ -421,12 +423,20 @@ static const struct of_device_id orion_mdio_match[] = { ...@@ -421,12 +423,20 @@ static const struct of_device_id orion_mdio_match[] = {
}; };
MODULE_DEVICE_TABLE(of, orion_mdio_match); MODULE_DEVICE_TABLE(of, orion_mdio_match);
static const struct acpi_device_id orion_mdio_acpi_match[] = {
{ "MRVL0100", BUS_TYPE_SMI },
{ "MRVL0101", BUS_TYPE_XSMI },
{ },
};
MODULE_DEVICE_TABLE(acpi, orion_mdio_acpi_match);
static struct platform_driver orion_mdio_driver = { static struct platform_driver orion_mdio_driver = {
.probe = orion_mdio_probe, .probe = orion_mdio_probe,
.remove = orion_mdio_remove, .remove = orion_mdio_remove,
.driver = { .driver = {
.name = "orion-mdio", .name = "orion-mdio",
.of_match_table = orion_mdio_match, .of_match_table = orion_mdio_match,
.acpi_match_table = ACPI_PTR(orion_mdio_acpi_match),
}, },
}; };
......
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