Commit ef3cf9f2fbef8279a29a027db0d02b56bd0b75f3
Committed by
David S. Miller
David S. Miller
1 parent
7e4ee4d947
Exists in
master
and in
39 other branches
cs89x0: Removing dead SH_HICOSH4
SH_HICOSH4 doesn't exist in Kconfig, therefore removing all references for it from the source code. Signed-off-by: Christoph Egger <siccegge@cs.fau.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Showing 2 changed files with 2 additions and 53 deletions Side-by-side Diff
drivers/net/cs89x0.c
| ... | ... | @@ -170,11 +170,7 @@ |
| 170 | 170 | /* The cs8900 has 4 IRQ pins, software selectable. cs8900_irq_map maps |
| 171 | 171 | them to system IRQ numbers. This mapping is card specific and is set to |
| 172 | 172 | the configuration of the Cirrus Eval board for this chip. */ |
| 173 | -#if defined(CONFIG_SH_HICOSH4) | |
| 174 | -static unsigned int netcard_portlist[] __used __initdata = | |
| 175 | - { 0x0300, 0}; | |
| 176 | -static unsigned int cs8900_irq_map[] = {1,0,0,0}; | |
| 177 | -#elif defined(CONFIG_MACH_IXDP2351) | |
| 173 | +#if defined(CONFIG_MACH_IXDP2351) | |
| 178 | 174 | static unsigned int netcard_portlist[] __used __initdata = {IXDP2351_VIRT_CS8900_BASE, 0}; |
| 179 | 175 | static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900, 0, 0, 0}; |
| 180 | 176 | #elif defined(CONFIG_ARCH_IXDP2X01) |
| ... | ... | @@ -578,12 +574,6 @@ |
| 578 | 574 | goto out1; |
| 579 | 575 | } |
| 580 | 576 | |
| 581 | -#ifdef CONFIG_SH_HICOSH4 | |
| 582 | - /* truly reset the chip */ | |
| 583 | - writeword(ioaddr, ADD_PORT, 0x0114); | |
| 584 | - writeword(ioaddr, DATA_PORT, 0x0040); | |
| 585 | -#endif | |
| 586 | - | |
| 587 | 577 | /* if they give us an odd I/O address, then do ONE write to |
| 588 | 578 | the address port, to get it back to address zero, where we |
| 589 | 579 | expect to find the EISA signature word. An IO with a base of 0x3 |
| 590 | 580 | |
| ... | ... | @@ -649,38 +639,7 @@ |
| 649 | 639 | the driver will always do *something* instead of complain that |
| 650 | 640 | adapter_cnf is 0. */ |
| 651 | 641 | |
| 652 | -#ifdef CONFIG_SH_HICOSH4 | |
| 653 | - if (1) { | |
| 654 | - /* For the HiCO.SH4 board, things are different: we don't | |
| 655 | - have EEPROM, but there is some data in flash, so we go | |
| 656 | - get it there directly (MAC). */ | |
| 657 | - __u16 *confd; | |
| 658 | - short cnt; | |
| 659 | - if (((* (volatile __u32 *) 0xa0013ff0) & 0x00ffffff) | |
| 660 | - == 0x006c3000) { | |
| 661 | - confd = (__u16*) 0xa0013fc0; | |
| 662 | - } else { | |
| 663 | - confd = (__u16*) 0xa001ffc0; | |
| 664 | - } | |
| 665 | - cnt = (*confd++ & 0x00ff) >> 1; | |
| 666 | - while (--cnt > 0) { | |
| 667 | - __u16 j = *confd++; | |
| 668 | 642 | |
| 669 | - switch (j & 0x0fff) { | |
| 670 | - case PP_IA: | |
| 671 | - for (i = 0; i < ETH_ALEN/2; i++) { | |
| 672 | - dev->dev_addr[i*2] = confd[i] & 0xFF; | |
| 673 | - dev->dev_addr[i*2+1] = confd[i] >> 8; | |
| 674 | - } | |
| 675 | - break; | |
| 676 | - } | |
| 677 | - j = (j >> 12) + 1; | |
| 678 | - confd += j; | |
| 679 | - cnt -= j; | |
| 680 | - } | |
| 681 | - } else | |
| 682 | -#endif | |
| 683 | - | |
| 684 | 643 | if ((readreg(dev, PP_SelfST) & (EEPROM_OK | EEPROM_PRESENT)) == |
| 685 | 644 | (EEPROM_OK|EEPROM_PRESENT)) { |
| 686 | 645 | /* Load the MAC. */ |
| ... | ... | @@ -734,11 +693,7 @@ |
| 734 | 693 | printk("\n"); |
| 735 | 694 | |
| 736 | 695 | /* First check to see if an EEPROM is attached. */ |
| 737 | -#ifdef CONFIG_SH_HICOSH4 /* no EEPROM on HiCO, don't hazzle with it here */ | |
| 738 | - if (1) { | |
| 739 | - printk(KERN_NOTICE "cs89x0: No EEPROM on HiCO.SH4\n"); | |
| 740 | - } else | |
| 741 | -#endif | |
| 696 | + | |
| 742 | 697 | if ((readreg(dev, PP_SelfST) & EEPROM_PRESENT) == 0) |
| 743 | 698 | printk(KERN_WARNING "cs89x0: No EEPROM, relying on command line....\n"); |
| 744 | 699 | else if (get_eeprom_data(dev, START_EEPROM_DATA,CHKSUM_LEN,eeprom_buff) < 0) { |
| ... | ... | @@ -1275,7 +1230,6 @@ |
| 1275 | 1230 | int i; |
| 1276 | 1231 | int ret; |
| 1277 | 1232 | |
| 1278 | -#if !defined(CONFIG_SH_HICOSH4) && !defined(CONFIG_ARCH_PNX010X) /* uses irq#1, so this won't work */ | |
| 1279 | 1233 | if (dev->irq < 2) { |
| 1280 | 1234 | /* Allow interrupts to be generated by the chip */ |
| 1281 | 1235 | /* Cirrus' release had this: */ |
| ... | ... | @@ -1304,7 +1258,6 @@ |
| 1304 | 1258 | } |
| 1305 | 1259 | } |
| 1306 | 1260 | else |
| 1307 | -#endif | |
| 1308 | 1261 | { |
| 1309 | 1262 | #ifndef CONFIG_CS89x0_NONISA_IRQ |
| 1310 | 1263 | if (((1 << dev->irq) & lp->irq_map) == 0) { |
drivers/net/cs89x0.h
| ... | ... | @@ -437,11 +437,7 @@ |
| 437 | 437 | #define IRQ_MAP_EEPROM_DATA 0x0046 /* Offset into eeprom for the IRQ map */ |
| 438 | 438 | #define IRQ_MAP_LEN 0x0004 /* No of bytes to read for the IRQ map */ |
| 439 | 439 | #define PNP_IRQ_FRMT 0x0022 /* PNP small item IRQ format */ |
| 440 | -#ifdef CONFIG_SH_HICOSH4 | |
| 441 | -#define CS8900_IRQ_MAP 0x0002 /* HiCO-SH4 board has its IRQ on #1 */ | |
| 442 | -#else | |
| 443 | 440 | #define CS8900_IRQ_MAP 0x1c20 /* This IRQ map is fixed */ |
| 444 | -#endif | |
| 445 | 441 | |
| 446 | 442 | #define CS8920_NO_INTS 0x0F /* Max CS8920 interrupt select # */ |
| 447 | 443 |