sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

ARM: i.MX: ocotp: Fix MAC address provider for unaligned addresses 

The current algorithm assumes the MAC address starts at a 4 byte
aligned address. Unfortunately this is not always the case. On the
i.MX6sx the MAC Address for the second FEC starts at offset 0x632.
The register space for the fuse map has holes, only the 16 byte
aligned words contain data. This means we have to skip the holes.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2014-11-26 17:21:54 +01:00
parent f2142fb6da
commit f154e9ca76
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
arch/arm/mach-imx/ocotp.c
View File

@ -320,6 +320,14 @@ static struct file_operations imx6_ocotp_ops = {
.lseek = dev_lseek_default,
};
static uint32_t inc_offset(uint32_t offset)
{
if ((offset & 0x3) == 0x3)
return offset + 0xd;
else
return offset + 1;
}
static void imx_ocotp_init_dt(struct device_d *dev, void __iomem *base)
{
char mac[6];
@ -336,21 +344,24 @@ static void imx_ocotp_init_dt(struct device_d *dev, void __iomem *base)
while (len >= MAC_ADDRESS_PROPLEN) {
struct device_node *rnode;
uint32_t phandle, offset, value;
uint32_t phandle, offset;
phandle = be32_to_cpup(prop++);
rnode = of_find_node_by_phandle(phandle);
offset = be32_to_cpup(prop++);
value = readl(base + offset + 0x10);
mac[0] = (value >> 8);
mac[1] = value;
value = readl(base + offset);
mac[2] = value >> 24;
mac[3] = value >> 16;
mac[4] = value >> 8;
mac[5] = value;
mac[5] = readb(base + offset);
offset = inc_offset(offset);
mac[4] = readb(base + offset);
offset = inc_offset(offset);
mac[3] = readb(base + offset);
offset = inc_offset(offset);
mac[2] = readb(base + offset);
offset = inc_offset(offset);
mac[1] = readb(base + offset);
offset = inc_offset(offset);
mac[0] = readb(base + offset);
of_eth_register_ethaddr(rnode, mac);