niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

net: fec: adopt pinctrl support

Browse source 
Cc: netdev@vger.kernel.org
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
Acked-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Shawn Guo 2012-05-06 20:24:04 +08:00
parent fed78ce4c6
commit b2bccee179
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/net/ethernet/freescale/fec.c
View file

@ -48,6 +48,7 @@
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#include <linux/of_net.h> #include <linux/of_net.h>
#include <linux/pinctrl/consumer.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
@ -1542,6 +1543,7 @@ fec_probe(struct platform_device *pdev)
struct resource *r; struct resource *r;
const struct of_device_id *of_id; const struct of_device_id *of_id;
static int dev_id; static int dev_id;
struct pinctrl *pinctrl;
of_id = of_match_device(fec_dt_ids, &pdev->dev); of_id = of_match_device(fec_dt_ids, &pdev->dev);
if (of_id) if (of_id)
@ -1609,6 +1611,12 @@ fec_probe(struct platform_device *pdev)
} }
} }
pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
if (IS_ERR(pinctrl)) {
ret = PTR_ERR(pinctrl);
goto failed_pin;
}
fep->clk = clk_get(&pdev->dev, NULL); fep->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(fep->clk)) { if (IS_ERR(fep->clk)) {
ret = PTR_ERR(fep->clk); ret = PTR_ERR(fep->clk);
@ -1639,6 +1647,7 @@ failed_mii_init:
failed_init: failed_init:
clk_disable_unprepare(fep->clk); clk_disable_unprepare(fep->clk);
clk_put(fep->clk); clk_put(fep->clk);
failed_pin:
failed_clk: failed_clk:
for (i = 0; i < FEC_IRQ_NUM; i++) { for (i = 0; i < FEC_IRQ_NUM; i++) {
irq = platform_get_irq(pdev, i); irq = platform_get_irq(pdev, i);