mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Lucas Stach <l.stach@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 1/2] ARM: imx6: move MX6UL enet setup out of CPU string setting
Date: Mon, 10 Jul 2017 17:38:21 +0200	[thread overview]
Message-ID: <20170710153822.15379-1-l.stach@pengutronix.de> (raw)

This is not a good place to do this ENET setup. Call the function like all
the other setup functions and bail out if the SoC is not a i.MX6UL/ULL.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/mach-imx/imx6.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c
index 5afbf6b30f18..7df61b94ec85 100644
--- a/arch/arm/mach-imx/imx6.c
+++ b/arch/arm/mach-imx/imx6.c
@@ -126,6 +126,9 @@ void imx6ul_enet_clk_init(void)
 	void __iomem *gprbase = IOMEM(MX6_IOMUXC_BASE_ADDR) + 0x4000;
 	uint32_t val;
 
+	if (!cpu_mx6_is_mx6ul() && !cpu_mx6_is_mx6ull())
+		return;
+
 	val = readl(gprbase + IOMUXC_GPR1);
 	val |= (0x3 << 17);
 	writel(val, gprbase + IOMUXC_GPR1);
@@ -169,7 +172,6 @@ int imx6_init(void)
 		break;
 	case IMX6_CPUTYPE_IMX6UL:
 		cputypestr = "i.MX6 UltraLite";
-		imx6ul_enet_clk_init();
 		break;
 	case IMX6_CPUTYPE_IMX6ULL:
 		cputypestr = "i.MX6 ULL";
@@ -182,6 +184,7 @@ int imx6_init(void)
 	imx_set_silicon_revision(cputypestr, mx6_silicon_revision);
 
 	imx6_setup_ipu_qos();
+	imx6ul_enet_clk_init();
 
 	return 0;
 }
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2017-07-10 15:38 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-10 15:38 Lucas Stach [this message]
2017-07-10 15:38 ` [PATCH 2/2] ARM: imx6: add static annotation locally used functions Lucas Stach

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=20170710153822.15379-1-l.stach@pengutronix.de \
    --to=l.stach@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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