Skip to content

Commit

Permalink
net: fec: adopt pinctrl support
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Shawn Guo committed May 12, 2012
1 parent fed78ce commit b2bccee
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions drivers/net/ethernet/freescale/fec.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#include <linux/of_device.h>
#include <linux/of_gpio.h>
#include <linux/of_net.h>
#include <linux/pinctrl/consumer.h>

#include <asm/cacheflush.h>

Expand Down Expand Up @@ -1542,6 +1543,7 @@ fec_probe(struct platform_device *pdev)
struct resource *r;
const struct of_device_id *of_id;
static int dev_id;
struct pinctrl *pinctrl;

of_id = of_match_device(fec_dt_ids, &pdev->dev);
if (of_id)
Expand Down Expand Up @@ -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);
if (IS_ERR(fep->clk)) {
ret = PTR_ERR(fep->clk);
Expand Down Expand Up @@ -1639,6 +1647,7 @@ fec_probe(struct platform_device *pdev)
failed_init:
clk_disable_unprepare(fep->clk);
clk_put(fep->clk);
failed_pin:
failed_clk:
for (i = 0; i < FEC_IRQ_NUM; i++) {
irq = platform_get_irq(pdev, i);
Expand Down

0 comments on commit b2bccee

Please sign in to comment.