From: Florian Fainelli <florian@openwrt.org>
Date: Wed, 21 Jul 2010 20:59:26 +0000 (+0200)
Subject: MIPS: BCM63xx: Prevent second enet registration on BCM6338
X-Git-Tag: v2.6.35~28^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7f13f65e61f1deed77c5c335ed0fa4d08f69e608;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

MIPS: BCM63xx: Prevent second enet registration on BCM6338

This SoC has only one ethernet MAC, so prevent registration of a second one.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/1482/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/bcm63xx/dev-enet.c b/arch/mips/bcm63xx/dev-enet.c
index 9f544ba..39c2336 100644
--- a/arch/mips/bcm63xx/dev-enet.c
+++ b/arch/mips/bcm63xx/dev-enet.c
@@ -104,6 +104,9 @@ int __init bcm63xx_enet_register(int unit,
 	if (unit > 1)
 		return -ENODEV;
 
+	if (unit == 1 && BCMCPU_IS_6338())
+		return -ENODEV;
+
 	if (!shared_device_registered) {
 		shared_res[0].start = bcm63xx_regset_address(RSET_ENETDMA);
 		shared_res[0].end = shared_res[0].start;