diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-07-21 16:59:26 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2010-07-26 14:08:18 -0400 |
| commit | 7f13f65e61f1deed77c5c335ed0fa4d08f69e608 (patch) | |
| tree | 3dacdf60e053e8aa74c411a82e025ea5c8b0f9d2 | |
| parent | f2a68272d799bf4092443357142f63b74f7669a1 (diff) | |
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>
| -rw-r--r-- | arch/mips/bcm63xx/dev-enet.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/bcm63xx/dev-enet.c b/arch/mips/bcm63xx/dev-enet.c index 9f544badd0b4..39c23366c5c7 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, | |||
| 104 | if (unit > 1) | 104 | if (unit > 1) |
| 105 | return -ENODEV; | 105 | return -ENODEV; |
| 106 | 106 | ||
| 107 | if (unit == 1 && BCMCPU_IS_6338()) | ||
| 108 | return -ENODEV; | ||
| 109 | |||
| 107 | if (!shared_device_registered) { | 110 | if (!shared_device_registered) { |
| 108 | shared_res[0].start = bcm63xx_regset_address(RSET_ENETDMA); | 111 | shared_res[0].start = bcm63xx_regset_address(RSET_ENETDMA); |
| 109 | shared_res[0].end = shared_res[0].start; | 112 | shared_res[0].end = shared_res[0].start; |
