diff options
| author |   Tony Lindgren <tony@atomide.com> | 2015-11-18 17:27:25 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-11-20 10:46:33 -0500 |
| commit | 0db19b850468a24b70d8471f5ebe71f0a035bbab (patch) | |
| tree | 4f02b5ca6a2000dab34b1960cb1f21edc6390055 /drivers/net/ethernet/ti | |
| parent | tcp: md5: fix lockdep annotation (diff) | |
| download | linux-dev-0db19b850468a24b70d8471f5ebe71f0a035bbab.tar.xz linux-dev-0db19b850468a24b70d8471f5ebe71f0a035bbab.zip | |
net: cpsw: Fix ethernet regression for dm814x
Commit b6745f6e4e63 ("drivers: net: cpsw: davinci_emac: move reading mac
id to common file") started using of_machine_is_compatible for detecting
type but missed at dm8148 causing Ethernet to stop working.
Let's fix the issue by adding handling for dm814x.
Cc: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-by: Mugunthnan V N <mugunthanvnm@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti')
| -rw-r--r-- | drivers/net/ethernet/ti/cpsw-common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/ti/cpsw-common.c b/drivers/net/ethernet/ti/cpsw-common.c index c08be62bceba..1562ab4151e1 100644 --- a/drivers/net/ethernet/ti/cpsw-common.c +++ b/drivers/net/ethernet/ti/cpsw-common.c @@ -78,6 +78,9 @@ static int cpsw_am33xx_cm_get_macid(struct device *dev, u16 offset, int slave, int ti_cm_get_macid(struct device *dev, int slave, u8 *mac_addr) { + if (of_machine_is_compatible("ti,dm8148")) + return cpsw_am33xx_cm_get_macid(dev, 0x630, slave, mac_addr); + if (of_machine_is_compatible("ti,am33xx")) return cpsw_am33xx_cm_get_macid(dev, 0x630, slave, mac_addr); |