From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shawn Guo Subject: [PATCH RESEND 2/5] net: fec: adopt pinctrl support Date: Mon, 7 May 2012 08:53:57 +0800 Message-ID: <1336352040-28447-3-git-send-email-shawn.guo@linaro.org> References: <1336352040-28447-1-git-send-email-shawn.guo@linaro.org> Cc: Arnd Bergmann , Olof Johansson , Sascha Hauer , Dong Aisheng , Shawn Guo , netdev@vger.kernel.org, "David S. Miller" To: linux-arm-kernel@lists.infradead.org Return-path: Received: from mail-pb0-f46.google.com ([209.85.160.46]:61005 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755077Ab2EGAx5 (ORCPT ); Sun, 6 May 2012 20:53:57 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so6011295pbb.19 for ; Sun, 06 May 2012 17:53:57 -0700 (PDT) In-Reply-To: <1336352040-28447-1-git-send-email-shawn.guo@linaro.org> Sender: netdev-owner@vger.kernel.org List-ID: Cc: netdev@vger.kernel.org Cc: David S. Miller Signed-off-by: Shawn Guo --- drivers/net/ethernet/freescale/fec.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c index a12b3f5..500c106 100644 --- a/drivers/net/ethernet/freescale/fec.c +++ b/drivers/net/ethernet/freescale/fec.c @@ -48,6 +48,7 @@ #include #include #include +#include #include @@ -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) @@ -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); @@ -1639,6 +1647,7 @@ failed_mii_init: 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); -- 1.7.5.4