summaryrefslogtreecommitdiffstats
path: root/drivers/net/cs89x0.c
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2006-01-08 01:01:11 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-08 20:12:45 -0800
commit3b68d70dffe255e7681d5725d96bc2b92a24bb9d (patch)
tree0f311381f9d39e10360431cb57c94b7bcae62727 /drivers/net/cs89x0.c
parent3eaa5e7dcce0653d2bfd2ab85a623687da49f8d5 (diff)
downloadop-kernel-dev-3b68d70dffe255e7681d5725d96bc2b92a24bb9d.zip
op-kernel-dev-3b68d70dffe255e7681d5725d96bc2b92a24bb9d.tar.gz
[PATCH] cs89x0: cleanly implement ixdp2x01 and pnx0501 support
Implement suitable versions of the readword/writeword macros for ixdp2x01 and pnx0501. Handle the 32-bit spacing of the registers in these functions instead of in the header file. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Cc: dmitry pervushin <dpervushin@ru.mvista.com> Cc: <dsaxena@plexity.net> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net/cs89x0.c')
-rw-r--r--drivers/net/cs89x0.c28
1 files changed, 28 insertions, 0 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 756d80a..7abc9f8 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -338,6 +338,32 @@ out:
}
#endif
+#if defined(CONFIG_ARCH_IXDP2X01)
+static int
+readword(unsigned long base_addr, int portno)
+{
+ return (u16)__raw_readl(base_addr + (portno << 1));
+}
+
+static void
+writeword(unsigned long base_addr, int portno, int value)
+{
+ __raw_writel((u16)value, base_addr + (portno << 1));
+}
+#else
+#if defined(CONFIG_ARCH_PNX0501)
+static int
+readword(unsigned long base_addr, int portno)
+{
+ return inw(base_addr + (portno << 1));
+}
+
+static void
+writeword(unsigned long base_addr, int portno, int value)
+{
+ outw(value, base_addr + (portno << 1));
+}
+#else
static int
readword(unsigned long base_addr, int portno)
{
@@ -349,6 +375,8 @@ writeword(unsigned long base_addr, int portno, int value)
{
outw(value, base_addr + portno);
}
+#endif
+#endif
static int
readreg(struct net_device *dev, int regno)
OpenPOWER on IntegriCloud