The patch titled
spidernet: spidernet: add support for Celleb
has been added to the -mm tree. Its filename is
spidernet-spidernet-add-support-for-celleb.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: spidernet: spidernet: add support for Celleb
From: Kou Ishizaki <kou.ishizaki@xxxxxxxxxxxxx>
This patch adds or changes some HW specific settings for spider_net on Celleb.
Signed-off-by: Kou Ishizaki <kou.ishizaki@xxxxxxxxxxxxx>
Signed-off-by: Linas Vepstas <linas@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/Kconfig | 2 +-
drivers/net/spider_net.c | 8 +++++++-
drivers/net/spider_net.h | 6 ++++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff -puN drivers/net/Kconfig~spidernet-spidernet-add-support-for-celleb drivers/net/Kconfig
--- a/drivers/net/Kconfig~spidernet-spidernet-add-support-for-celleb
+++ a/drivers/net/Kconfig
@@ -2245,7 +2245,7 @@ config BNX2
config SPIDER_NET
tristate "Spider Gigabit Ethernet driver"
- depends on PCI && PPC_IBM_CELL_BLADE
+ depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
select FW_LOADER
help
This driver supports the Gigabit Ethernet chips present on the
diff -puN drivers/net/spider_net.c~spidernet-spidernet-add-support-for-celleb drivers/net/spider_net.c
--- a/drivers/net/spider_net.c~spidernet-spidernet-add-support-for-celleb
+++ a/drivers/net/spider_net.c
@@ -1,7 +1,8 @@
/*
- * Network device driver for Cell Processor-Based Blade
+ * Network device driver for Cell Processor-Based Blade and Celleb platform
*
* (C) Copyright IBM Corp. 2005
+ * (C) Copyright 2006 TOSHIBA CORPORATION
*
* Authors : Utz Bacher <utz.bacher@xxxxxxxxxx>
* Jens Osterkamp <Jens.Osterkamp@xxxxxxxxxx>
@@ -1605,6 +1606,11 @@ spider_net_init_card(struct spider_net_c
spider_net_write_reg(card, SPIDER_NET_CKRCTRL,
SPIDER_NET_CKRCTRL_RUN_VALUE);
+
+ /* trigger ETOMOD signal */
+ spider_net_write_reg(card, SPIDER_NET_GMACOPEMD,
+ spider_net_read_reg(card, SPIDER_NET_GMACOPEMD) | 0x4);
+
}
/**
diff -puN drivers/net/spider_net.h~spidernet-spidernet-add-support-for-celleb drivers/net/spider_net.h
--- a/drivers/net/spider_net.h~spidernet-spidernet-add-support-for-celleb
+++ a/drivers/net/spider_net.h
@@ -1,7 +1,8 @@
/*
- * Network device driver for Cell Processor-Based Blade
+ * Network device driver for Cell Processor-Based Blade and Celleb platform
*
* (C) Copyright IBM Corp. 2005
+ * (C) Copyright 2006 TOSHIBA CORPORATION
*
* Authors : Utz Bacher <utz.bacher@xxxxxxxxxx>
* Jens Osterkamp <Jens.Osterkamp@xxxxxxxxxx>
@@ -184,7 +185,8 @@ extern char spider_net_driver_name[];
/* pause frames: automatic, no upper retransmission count */
/* outside loopback mode: ETOMOD signal dont matter, not connected */
-#define SPIDER_NET_OPMODE_VALUE 0x00000063
+/* ETOMOD signal is brought to PHY reset. bit 2 must be 1 in Celleb */
+#define SPIDER_NET_OPMODE_VALUE 0x00000067
/*#define SPIDER_NET_OPMODE_VALUE 0x001b0062*/
#define SPIDER_NET_LENLMT_VALUE 0x00000908
_
Patches currently in -mm which might be from kou.ishizaki@xxxxxxxxxxxxx are
git-libata-all.patch
spidernet-autoneg-support-for-celleb.patch
spidernet-load-firmware-when-open.patch
spidernet-spidernet-add-support-for-celleb.patch
spidernet-remove-txram-full-logging.patch
spidernet-fix-racy-double-free-of-skb.patch
spidernet-maintainership.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
