diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-05-14 07:11:19 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-05-14 07:11:19 +0200 |
| commit | 6e68393fb17254850b9bfc8e268569a05111c29c (patch) | |
| tree | e5a5b22a64f3772458f44c7110f5ec9653d56bcd /drivers/net | |
| parent | 45000aac11315d7ccbaeefa29cafc8303ac206cb (diff) | |
| parent | 6ccb3eb306022f7334a086f46d03a189e0abd937 (diff) | |
| download | barebox-6e68393fb17254850b9bfc8e268569a05111c29c.tar.gz barebox-6e68393fb17254850b9bfc8e268569a05111c29c.tar.xz | |
Merge branch 'for-next/mxs'
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fec_imx.c | 6 | ||||
| -rw-r--r-- | drivers/net/fec_imx.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index f814b3b960..772f930f0d 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -705,10 +705,10 @@ static int fec_clk_get(struct fec_priv *fec) { int i, err = 0; static const char *clk_names[ARRAY_SIZE(fec->clk)] = { - "ipg", "ahb", "ptp" + "ipg", "ahb", }; static const char *opt_clk_names[ARRAY_SIZE(fec->opt_clk)] = { - "enet_clk_ref", "enet_out", + "enet_clk_ref", "enet_out", "ptp" }; for (i = 0; i < ARRAY_SIZE(fec->clk); i++) { @@ -716,7 +716,7 @@ static int fec_clk_get(struct fec_priv *fec) if (IS_ERR(fec->clk[i])) { err = PTR_ERR(fec->clk[i]); fec_clk_put(fec); - break; + return err; } } diff --git a/drivers/net/fec_imx.h b/drivers/net/fec_imx.h index d1ac92f0e3..316eefe48f 100644 --- a/drivers/net/fec_imx.h +++ b/drivers/net/fec_imx.h @@ -121,7 +121,6 @@ enum fec_type { enum fec_clock { FEC_CLK_IPG, FEC_CLK_AHB, - FEC_CLK_PTP, FEC_CLK_NUM }; @@ -129,6 +128,7 @@ enum fec_clock { enum fec_opt_clock { FEC_OPT_CLK_REF, FEC_OPT_CLK_OUT, + FEC_OPT_CLK_PTP, FEC_OPT_CLK_NUM }; |