提交 8ef29f8a 编写于 作者: J Jean-Christophe PLAGNIOL-VILLARD 提交者: David S. Miller

net/macb: add pinctrl consumer support

If no pinctrl available just report a warning as some architecture may not
need to do anything.
Signed-off-by: NJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
[nicolas.ferre@atmel.com: adapt the error path, remove unneeded headers]
Signed-off-by: NNicolas Ferre <nicolas.ferre@atmel.com>
Tested-by: NJoachim Eastwood <manabian@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 29bc2e1e
......@@ -26,6 +26,7 @@
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/of_net.h>
#include <linux/pinctrl/consumer.h>
#include "macb.h"
......@@ -1472,6 +1473,7 @@ static int __init macb_probe(struct platform_device *pdev)
struct phy_device *phydev;
u32 config;
int err = -ENXIO;
struct pinctrl *pinctrl;
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!regs) {
......@@ -1479,6 +1481,15 @@ static int __init macb_probe(struct platform_device *pdev)
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;
dev = alloc_etherdev(sizeof(*bp));
if (!dev)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册