From patchwork Wed Jun 26 13:08:49 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Philipp Zabel
X-Patchwork-Id: 254839
Return-Path:
X-Original-To: incoming-imx@patchwork.ozlabs.org
Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org
Received: from casper.infradead.org (casper.infradead.org
[IPv6:2001:770:15f::2])
(using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by ozlabs.org (Postfix) with ESMTPS id 57B892C008E
for ;
Thu, 27 Jun 2013 04:53:24 +1000 (EST)
Received: from merlin.infradead.org ([205.233.59.134])
by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux))
id 1UrsEG-0003Mr-3U; Wed, 26 Jun 2013 16:05:58 +0000
Received: from localhost ([::1] helo=merlin.infradead.org)
by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux))
id 1UrsBe-0006GG-Tm; Wed, 26 Jun 2013 16:03:14 +0000
Received: from bombadil.infradead.org ([2001:1868:205::9])
by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux))
id 1Urs17-0005IC-Or for linux-arm-kernel@merlin.infradead.org;
Wed, 26 Jun 2013 15:52:21 +0000
Received: from metis.ext.pengutronix.de
([2001:6f8:1178:4:290:27ff:fe1d:cc33])
by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat
Linux)) id 1UrpTl-0007T6-3K
for linux-arm-kernel@lists.infradead.org;
Wed, 26 Jun 2013 13:09:46 +0000
Received: from dude.hi.pengutronix.de ([10.1.0.7] helo=dude.pengutronix.de)
by metis.ext.pengutronix.de with esmtp (Exim 4.72)
(envelope-from )
id 1UrpSv-00027z-PL; Wed, 26 Jun 2013 15:08:53 +0200
From: Philipp Zabel
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] ARM i.MX6Q: Use ENET_CLK_SEL defines in imx6q_1588_init
Date: Wed, 26 Jun 2013 15:08:49 +0200
Message-Id: <1372252129-18898-2-git-send-email-p.zabel@pengutronix.de>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1372252129-18898-1-git-send-email-p.zabel@pengutronix.de>
References: <1372252129-18898-1-git-send-email-p.zabel@pengutronix.de>
X-SA-Exim-Connect-IP: 10.1.0.7
X-SA-Exim-Mail-From: p.zabel@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de);
SAEximRunCond expanded to false
X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
X-CRM114-CacheID: sfid-20130626_060945_396891_D0D4C008
X-CRM114-Status: UNSURE ( 9.75 )
X-CRM114-Notice: Please train this message.
X-Spam-Score: -1.3 (-)
X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary:
Content analysis details: (-1.3 points)
pts rule name description
---- ----------------------
--------------------------------------------------
-1.3 RP_MATCHES_RCVD Envelope sender domain matches handover relay
domain
Cc: Shawn Guo , Philipp Zabel ,
kernel@pengutronix.de
X-BeenThere: linux-arm-kernel@lists.infradead.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Unsubscribe:
,
List-Archive:
List-Post:
List-Help:
List-Subscribe:
,
MIME-Version: 1.0
Sender: "linux-arm-kernel"
Errors-To:
linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org
List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org
Signed-off-by: Philipp Zabel
---
arch/arm/mach-imx/mach-imx6q.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index db1db78..adabe2b 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -242,7 +242,9 @@ static void __init imx6q_1588_init(void)
gpr = syscon_regmap_lookup_by_compatible("fsl,imx6q-iomuxc-gpr");
if (!IS_ERR(gpr))
- regmap_update_bits(gpr, 0x4, 1 << 21, 1 << 21);
+ regmap_update_bits(gpr, IOMUXC_GPR1,
+ IMX6Q_GPR1_ENET_CLK_SEL_MASK,
+ IMX6Q_GPR1_ENET_CLK_SEL_ANATOP);
else
pr_err("failed to find fsl,imx6q-iomux-gpr regmap\n");