aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cs89x0.c
diff options
context:
space:
mode:
authorChristoph Egger <siccegge@cs.fau.de>2010-07-19 00:37:11 -0400
committerDavid S. Miller <davem@davemloft.net>2010-07-19 16:32:57 -0400
commite6e4ec2f98ae3b75cfede011c8794120914e789f (patch)
tree362176711ba750c0a7ffa28db87e7ab5e2c59221 /drivers/net/cs89x0.c
parent0bdc0d70c535d59c10add461b96340425f0aac7d (diff)
net: Removing dead ARCH_PNX010X
ARCH_PNX010X doesn't exist in Kconfig, therefore removing all references for it from the source code/Kconfig. Signed-off-by: Christoph Egger <siccegge@cs.fau.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cs89x0.c')
-rw-r--r--drivers/net/cs89x0.c45
1 files changed, 0 insertions, 45 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 89f2ef7f16de..d325e01a53e0 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -176,12 +176,6 @@ static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900, 0, 0, 0};
176#elif defined(CONFIG_ARCH_IXDP2X01) 176#elif defined(CONFIG_ARCH_IXDP2X01)
177static unsigned int netcard_portlist[] __used __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0}; 177static unsigned int netcard_portlist[] __used __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0};
178static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0}; 178static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0};
179#elif defined(CONFIG_ARCH_PNX010X)
180#include <mach/gpio.h>
181#define CIRRUS_DEFAULT_BASE IO_ADDRESS(EXT_STATIC2_s0_BASE + 0x200000) /* = Physical address 0x48200000 */
182#define CIRRUS_DEFAULT_IRQ VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */
183static unsigned int netcard_portlist[] __used __initdata = {CIRRUS_DEFAULT_BASE, 0};
184static unsigned int cs8900_irq_map[] = {CIRRUS_DEFAULT_IRQ, 0, 0, 0};
185#elif defined(CONFIG_MACH_MX31ADS) 179#elif defined(CONFIG_MACH_MX31ADS)
186#include <mach/board-mx31ads.h> 180#include <mach/board-mx31ads.h>
187static unsigned int netcard_portlist[] __used __initdata = { 181static unsigned int netcard_portlist[] __used __initdata = {
@@ -367,18 +361,6 @@ writeword(unsigned long base_addr, int portno, u16 value)
367{ 361{
368 __raw_writel(value, base_addr + (portno << 1)); 362 __raw_writel(value, base_addr + (portno << 1));
369} 363}
370#elif defined(CONFIG_ARCH_PNX010X)
371static u16
372readword(unsigned long base_addr, int portno)
373{
374 return inw(base_addr + (portno << 1));
375}
376
377static void
378writeword(unsigned long base_addr, int portno, u16 value)
379{
380 outw(value, base_addr + (portno << 1));
381}
382#else 364#else
383static u16 365static u16
384readword(unsigned long base_addr, int portno) 366readword(unsigned long base_addr, int portno)
@@ -541,30 +523,6 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
541#endif 523#endif
542 } 524 }
543 525
544#ifdef CONFIG_ARCH_PNX010X
545 initialize_ebi();
546
547 /* Map GPIO registers for the pins connected to the CS8900a. */
548 if (map_cirrus_gpio() < 0)
549 return -ENODEV;
550
551 reset_cirrus();
552
553 /* Map event-router registers. */
554 if (map_event_router() < 0)
555 return -ENODEV;
556
557 enable_cirrus_irq();
558
559 unmap_cirrus_gpio();
560 unmap_event_router();
561
562 dev->base_addr = ioaddr;
563
564 for (i = 0 ; i < 3 ; i++)
565 readreg(dev, 0);
566#endif
567
568 /* Grab the region so we can find another board if autoIRQ fails. */ 526 /* Grab the region so we can find another board if autoIRQ fails. */
569 /* WTF is going on here? */ 527 /* WTF is going on here? */
570 if (!request_region(ioaddr & ~3, NETCARD_IO_EXTENT, DRV_NAME)) { 528 if (!request_region(ioaddr & ~3, NETCARD_IO_EXTENT, DRV_NAME)) {
@@ -1343,9 +1301,6 @@ net_open(struct net_device *dev)
1343 case A_CNF_MEDIA_10B_2: result = lp->adapter_cnf & A_CNF_10B_2; break; 1301 case A_CNF_MEDIA_10B_2: result = lp->adapter_cnf & A_CNF_10B_2; break;
1344 default: result = lp->adapter_cnf & (A_CNF_10B_T | A_CNF_AUI | A_CNF_10B_2); 1302 default: result = lp->adapter_cnf & (A_CNF_10B_T | A_CNF_AUI | A_CNF_10B_2);
1345 } 1303 }
1346#ifdef CONFIG_ARCH_PNX010X
1347 result = A_CNF_10B_T;
1348#endif
1349 if (!result) { 1304 if (!result) {
1350 printk(KERN_ERR "%s: EEPROM is configured for unavailable media\n", dev->name); 1305 printk(KERN_ERR "%s: EEPROM is configured for unavailable media\n", dev->name);
1351release_dma: 1306release_dma: