mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Baruch Siach <baruch@tkos.co.il>
To: barebox@lists.infradead.org
Subject: [PATCH] iim/imx25: fix MAC and UID offsets
Date: Tue, 17 Aug 2010 11:01:21 +0300	[thread overview]
Message-ID: <89d60716dad2ebc0ceb68446af11aff979fdc157.1282031791.git.baruch@tkos.co.il> (raw)
In-Reply-To: <cover.1281966840.git.baruch@tkos.co.il>

IIM_UID and IIM_MAC_ADDR are now fixed addresses.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
This should be applied on top of the "imx: support for the IIM fusebox" series.

 arch/arm/mach-imx/imx25.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-imx/imx25.c b/arch/arm/mach-imx/imx25.c
index 760f740..e73f8ee 100644
--- a/arch/arm/mach-imx/imx25.c
+++ b/arch/arm/mach-imx/imx25.c
@@ -44,13 +44,13 @@ u64 imx_uid(void)
 	 * values in IIM are big-endian as per AN3682.
 	 */
 	for (i = 0; i < 8; i++)
-		uid |= (u64)readb(IMX_IIM_BASE + IIM_UID + i*4) << (i*8);
+		uid |= (u64)readb(IIM_UID + i*4) << (i*8);
 
 	return uid;
 }
 
 static struct imx_iim_platform_data imx25_iim_pdata = {
-	.mac_addr_base	= IMX_IIM_BASE + IIM_MAC_ADDR,
+	.mac_addr_base	= IIM_MAC_ADDR,
 };
 
 static struct device_d imx25_iim_dev = {
-- 
1.7.1


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

      parent reply	other threads:[~2010-08-17  8:01 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-16 14:10 [PATCH v2 0/6] imx: support for the IIM fusebox Baruch Siach
2010-08-16 14:10 ` [PATCH v2 1/6] imx: move IIM registers to their own header Baruch Siach
2010-08-16 14:10 ` [PATCH v2 2/6] imx: driver for the IIM fusebox Baruch Siach
2010-08-16 14:10 ` [PATCH v2 3/6] imx iim: add mac address support Baruch Siach
2010-08-17  6:52   ` Sascha Hauer
2010-08-17  8:00     ` [PATCH v3] " Baruch Siach
2010-08-16 14:10 ` [PATCH v2 4/6] imx25: add chip specific IIM fusebox defines Baruch Siach
2011-03-03 15:13   ` Eric Benard
2011-03-03 15:31     ` Baruch Siach
2011-03-03 15:38       ` Eric Benard
2011-03-03 15:46       ` Sascha Hauer
2010-08-16 14:10 ` [PATCH v2 5/6] imx25: add iim platform code Baruch Siach
2010-08-16 14:10 ` [PATCH v2 6/6] fec_imx: add support for IIM stored mac address Baruch Siach
2010-08-17  8:01 ` Baruch Siach [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=89d60716dad2ebc0ceb68446af11aff979fdc157.1282031791.git.baruch@tkos.co.il \
    --to=baruch@tkos.co.il \
    --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