summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2010-08-17 11:01:21 +0300
committerSascha Hauer <s.hauer@pengutronix.de>2010-08-17 10:21:26 +0200
commitfb3c39ea753c1fc1b223ed4ff3e6b419d3eb3dda (patch)
tree0fa24b5b99a6b4a2b10aa2d8759b08211fb79872
parent9965f8f78a17941889346d760ed3136fa1bae42c (diff)
downloadbarebox-fb3c39ea753c1fc1b223ed4ff3e6b419d3eb3dda.tar.gz
barebox-fb3c39ea753c1fc1b223ed4ff3e6b419d3eb3dda.tar.xz
iim/imx25: fix MAC and UID offsets
IIM_UID and IIM_MAC_ADDR are now fixed addresses. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-imx/imx25.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/imx25.c b/arch/arm/mach-imx/imx25.c
index dc64d9fae8..b48f7481e8 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 = {