|
@@ -30,7 +30,6 @@
|
|
#include <linux/of_device.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/of_mdio.h>
|
|
#include <linux/of_mdio.h>
|
|
#include <linux/of_net.h>
|
|
#include <linux/of_net.h>
|
|
-#include <linux/pinctrl/consumer.h>
|
|
|
|
|
|
|
|
#include "macb.h"
|
|
#include "macb.h"
|
|
|
|
|
|
@@ -2071,7 +2070,6 @@ static int __init macb_probe(struct platform_device *pdev)
|
|
struct phy_device *phydev;
|
|
struct phy_device *phydev;
|
|
u32 config;
|
|
u32 config;
|
|
int err = -ENXIO;
|
|
int err = -ENXIO;
|
|
- struct pinctrl *pinctrl;
|
|
|
|
const char *mac;
|
|
const char *mac;
|
|
|
|
|
|
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
@@ -2080,15 +2078,6 @@ static int __init macb_probe(struct platform_device *pdev)
|
|
goto err_out;
|
|
goto err_out;
|
|
}
|
|
}
|
|
|
|
|
|
- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
|
|
|
|
- if (IS_ERR(pinctrl)) {
|
|
|
|
- err = PTR_ERR(pinctrl);
|
|
|
|
- if (err == -EPROBE_DEFER)
|
|
|
|
- goto err_out;
|
|
|
|
-
|
|
|
|
- dev_warn(&pdev->dev, "No pinctrl provided\n");
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
err = -ENOMEM;
|
|
err = -ENOMEM;
|
|
dev = alloc_etherdev(sizeof(*bp));
|
|
dev = alloc_etherdev(sizeof(*bp));
|
|
if (!dev)
|
|
if (!dev)
|