From: Sascha Hauer <s.hauer@pengutronix.de>
To: Michael Grzeschik <m.grzeschik@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] ARM: phytec-som-imx6: the ethernet clocks get enabled by fec_imx
Date: Wed, 3 May 2017 14:00:28 +0200 [thread overview]
Message-ID: <20170503120028.garkiqb7edoiwqod@pengutronix.de> (raw)
In-Reply-To: <20170412092630.22040-1-m.grzeschik@pengutronix.de>
On Wed, Apr 12, 2017 at 11:26:30AM +0200, Michael Grzeschik wrote:
> All necessary clocks get already enabled through the fec_imx driver
> configured by the devicetree.
>
> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
> ---
> arch/arm/boards/phytec-som-imx6/board.c | 27 +--------------------------
> 1 file changed, 1 insertion(+), 26 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/arch/arm/boards/phytec-som-imx6/board.c b/arch/arm/boards/phytec-som-imx6/board.c
> index ed9453bdda..4d24a55f74 100644
> --- a/arch/arm/boards/phytec-som-imx6/board.c
> +++ b/arch/arm/boards/phytec-som-imx6/board.c
> @@ -31,7 +31,6 @@
> #include <mach/bbu.h>
> #include <platform_data/eth-fec.h>
> #include <mfd/imx6q-iomuxc-gpr.h>
> -#include <linux/clk.h>
> #include <linux/micrel_phy.h>
>
> #include <globalvar.h>
> @@ -97,32 +96,14 @@ int ksz8081_phy_fixup(struct phy_device *phydev)
> return 0;
> }
>
> -static int imx6ul_setup_fec(void)
> +static void imx6ul_setup_fec(void)
> {
> void __iomem *gprbase = IOMEM(MX6_IOMUXC_BASE_ADDR) + 0x4000;
> uint32_t val;
> - struct clk *clk;
>
> phy_register_fixup_for_uid(PHY_ID_KSZ8081, MICREL_PHY_ID_MASK,
> ksz8081_phy_fixup);
>
> - clk = clk_lookup("enet_ptp");
> - if (IS_ERR(clk))
> - goto err;
> -
> - clk_enable(clk);
> -
> - clk = clk_lookup("enet_ref");
> - if (IS_ERR(clk))
> - goto err;
> - clk_enable(clk);
> -
> - clk = clk_lookup("enet_ref_125m");
> - if (IS_ERR(clk))
> - goto err;
> -
> - clk_enable(clk);
> -
> val = readl(gprbase + IOMUXC_GPR1);
> /* Use 50M anatop loopback REF_CLK1 for ENET1, clear gpr1[13], set gpr1[17]*/
> val &= ~(1 << 13);
> @@ -131,12 +112,6 @@ static int imx6ul_setup_fec(void)
> val &= ~(1 << 14);
> val |= (1 << 18);
> writel(val, gprbase + IOMUXC_GPR1);
> -
> - return 0;
> -err:
> - pr_err("Setting up DFEC\n");
> -
> - return -EIO;
> }
>
> static int physom_imx6_devices_init(void)
> --
> 2.11.0
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2017-05-03 12:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-12 9:26 Michael Grzeschik
2017-05-03 12:00 ` Sascha Hauer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170503120028.garkiqb7edoiwqod@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=m.grzeschik@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox