diff options
author | Kou Ishizaki <kou.ishizaki@toshiba.co.jp> | 2007-02-20 17:36:14 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-27 04:16:03 -0500 |
commit | 3342cf0e59b6e360ae770f8082b062f4db09f3b5 (patch) | |
tree | ab31273455341c1f3ccbe86738fdd05fe03069b5 /drivers | |
parent | 3cf761ddccb9332218973e17f9b987bb5cae7b69 (diff) |
spidernet: spidernet: add support for Celleb
This patch adds or changes some HW specific settings for spider_net on
Celleb.
Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/spider_net.c | 8 | ||||
-rw-r--r-- | drivers/net/spider_net.h | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 38ac6796fc48..5ff0922e628c 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2245,7 +2245,7 @@ config BNX2 | |||
2245 | 2245 | ||
2246 | config SPIDER_NET | 2246 | config SPIDER_NET |
2247 | tristate "Spider Gigabit Ethernet driver" | 2247 | tristate "Spider Gigabit Ethernet driver" |
2248 | depends on PCI && PPC_IBM_CELL_BLADE | 2248 | depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB) |
2249 | select FW_LOADER | 2249 | select FW_LOADER |
2250 | help | 2250 | help |
2251 | This driver supports the Gigabit Ethernet chips present on the | 2251 | This driver supports the Gigabit Ethernet chips present on the |
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index fef455694d7a..5368e2797418 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
@@ -1,7 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * Network device driver for Cell Processor-Based Blade | 2 | * Network device driver for Cell Processor-Based Blade and Celleb platform |
3 | * | 3 | * |
4 | * (C) Copyright IBM Corp. 2005 | 4 | * (C) Copyright IBM Corp. 2005 |
5 | * (C) Copyright 2006 TOSHIBA CORPORATION | ||
5 | * | 6 | * |
6 | * Authors : Utz Bacher <utz.bacher@de.ibm.com> | 7 | * Authors : Utz Bacher <utz.bacher@de.ibm.com> |
7 | * Jens Osterkamp <Jens.Osterkamp@de.ibm.com> | 8 | * Jens Osterkamp <Jens.Osterkamp@de.ibm.com> |
@@ -1605,6 +1606,11 @@ spider_net_init_card(struct spider_net_card *card) | |||
1605 | 1606 | ||
1606 | spider_net_write_reg(card, SPIDER_NET_CKRCTRL, | 1607 | spider_net_write_reg(card, SPIDER_NET_CKRCTRL, |
1607 | SPIDER_NET_CKRCTRL_RUN_VALUE); | 1608 | SPIDER_NET_CKRCTRL_RUN_VALUE); |
1609 | |||
1610 | /* trigger ETOMOD signal */ | ||
1611 | spider_net_write_reg(card, SPIDER_NET_GMACOPEMD, | ||
1612 | spider_net_read_reg(card, SPIDER_NET_GMACOPEMD) | 0x4); | ||
1613 | |||
1608 | } | 1614 | } |
1609 | 1615 | ||
1610 | /** | 1616 | /** |
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h index 6f5ee27f80fc..e072a7cb66f5 100644 --- a/drivers/net/spider_net.h +++ b/drivers/net/spider_net.h | |||
@@ -1,7 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * Network device driver for Cell Processor-Based Blade | 2 | * Network device driver for Cell Processor-Based Blade and Celleb platform |
3 | * | 3 | * |
4 | * (C) Copyright IBM Corp. 2005 | 4 | * (C) Copyright IBM Corp. 2005 |
5 | * (C) Copyright 2006 TOSHIBA CORPORATION | ||
5 | * | 6 | * |
6 | * Authors : Utz Bacher <utz.bacher@de.ibm.com> | 7 | * Authors : Utz Bacher <utz.bacher@de.ibm.com> |
7 | * Jens Osterkamp <Jens.Osterkamp@de.ibm.com> | 8 | * Jens Osterkamp <Jens.Osterkamp@de.ibm.com> |
@@ -184,7 +185,8 @@ extern char spider_net_driver_name[]; | |||
184 | 185 | ||
185 | /* pause frames: automatic, no upper retransmission count */ | 186 | /* pause frames: automatic, no upper retransmission count */ |
186 | /* outside loopback mode: ETOMOD signal dont matter, not connected */ | 187 | /* outside loopback mode: ETOMOD signal dont matter, not connected */ |
187 | #define SPIDER_NET_OPMODE_VALUE 0x00000063 | 188 | /* ETOMOD signal is brought to PHY reset. bit 2 must be 1 in Celleb */ |
189 | #define SPIDER_NET_OPMODE_VALUE 0x00000067 | ||
188 | /*#define SPIDER_NET_OPMODE_VALUE 0x001b0062*/ | 190 | /*#define SPIDER_NET_OPMODE_VALUE 0x001b0062*/ |
189 | #define SPIDER_NET_LENLMT_VALUE 0x00000908 | 191 | #define SPIDER_NET_LENLMT_VALUE 0x00000908 |
190 | 192 | ||