These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / ethernet / stmicro / stmmac / dwmac-meson.c

diff --git a/kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c b/kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
index cca028d..c1bac19 100644 (file)
--- a/kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
+++ b/kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
@@ -15,6 +15,7 @@
 #include <linux/ethtool.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/stmmac.h>
 
@@ -46,24 +47,54 @@ static void meson6_dwmac_fix_mac_speed(void *priv, unsigned int speed)
        writel(val, dwmac->reg);
 }
 
-static void *meson6_dwmac_setup(struct platform_device *pdev)
+static int meson6_dwmac_probe(struct platform_device *pdev)
 {
+       struct plat_stmmacenet_data *plat_dat;
+       struct stmmac_resources stmmac_res;
        struct meson_dwmac *dwmac;
        struct resource *res;
+       int ret;
+
+       ret = stmmac_get_platform_resources(pdev, &stmmac_res);
+       if (ret)
+               return ret;
+
+       plat_dat = stmmac_probe_config_dt(pdev, &stmmac_res.mac);
+       if (IS_ERR(plat_dat))
+               return PTR_ERR(plat_dat);
 
        dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);
        if (!dwmac)
-               return ERR_PTR(-ENOMEM);
+               return -ENOMEM;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
        dwmac->reg = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(dwmac->reg))
-               return ERR_CAST(dwmac->reg);
+               return PTR_ERR(dwmac->reg);
+
+       plat_dat->bsp_priv = dwmac;
+       plat_dat->fix_mac_speed = meson6_dwmac_fix_mac_speed;
 
-       return dwmac;
+       return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
 }
 
-const struct stmmac_of_data meson6_dwmac_data = {
-       .setup          = meson6_dwmac_setup,
-       .fix_mac_speed  = meson6_dwmac_fix_mac_speed,
+static const struct of_device_id meson6_dwmac_match[] = {
+       { .compatible = "amlogic,meson6-dwmac" },
+       { }
 };
+MODULE_DEVICE_TABLE(of, meson6_dwmac_match);
+
+static struct platform_driver meson6_dwmac_driver = {
+       .probe  = meson6_dwmac_probe,
+       .remove = stmmac_pltfr_remove,
+       .driver = {
+               .name           = "meson6-dwmac",
+               .pm             = &stmmac_pltfr_pm_ops,
+               .of_match_table = meson6_dwmac_match,
+       },
+};
+module_platform_driver(meson6_dwmac_driver);
+
+MODULE_AUTHOR("Beniamino Galvani <b.galvani@gmail.com>");
+MODULE_DESCRIPTION("Amlogic Meson DWMAC glue layer");
+MODULE_LICENSE("GPL v2");