diff options
author | Sebastian Siewior <bigeasy@linutronix.de> | 2008-04-28 05:43:17 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2008-07-23 01:11:29 -0400 |
commit | c1863bed8c88324405dc2a922c153fe5d7df716c (patch) | |
tree | bf061373bdba0e9e4ab79357b101d2dd60d7aa75 /drivers/net | |
parent | 0d176af5b7e658490b75427ccd23ff6a158c472b (diff) |
m68knommu: remove RPXCLASSIC from the m68k tree
This ifdefs are leftovers from the time as the driver was running
on a ppc.
Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/fec.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 6abbcd5f7c3a..0ef7226efd5c 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c | |||
@@ -43,17 +43,9 @@ | |||
43 | #include <asm/pgtable.h> | 43 | #include <asm/pgtable.h> |
44 | #include <asm/cacheflush.h> | 44 | #include <asm/cacheflush.h> |
45 | 45 | ||
46 | #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || \ | ||
47 | defined(CONFIG_M5272) || defined(CONFIG_M528x) || \ | ||
48 | defined(CONFIG_M520x) || defined(CONFIG_M532x) | ||
49 | #include <asm/coldfire.h> | 46 | #include <asm/coldfire.h> |
50 | #include <asm/mcfsim.h> | 47 | #include <asm/mcfsim.h> |
51 | #include "fec.h" | 48 | #include "fec.h" |
52 | #else | ||
53 | #include <asm/8xx_immap.h> | ||
54 | #include <asm/mpc8xx.h> | ||
55 | #include "commproc.h" | ||
56 | #endif | ||
57 | 49 | ||
58 | #if defined(CONFIG_FEC2) | 50 | #if defined(CONFIG_FEC2) |
59 | #define FEC_MAX_PORTS 2 | 51 | #define FEC_MAX_PORTS 2 |
@@ -1229,14 +1221,9 @@ static phy_info_t const * const phy_info[] = { | |||
1229 | 1221 | ||
1230 | /* ------------------------------------------------------------------------- */ | 1222 | /* ------------------------------------------------------------------------- */ |
1231 | #ifdef HAVE_mii_link_interrupt | 1223 | #ifdef HAVE_mii_link_interrupt |
1232 | #ifdef CONFIG_RPXCLASSIC | ||
1233 | static void | ||
1234 | mii_link_interrupt(void *dev_id); | ||
1235 | #else | ||
1236 | static irqreturn_t | 1224 | static irqreturn_t |
1237 | mii_link_interrupt(int irq, void * dev_id); | 1225 | mii_link_interrupt(int irq, void * dev_id); |
1238 | #endif | 1226 | #endif |
1239 | #endif | ||
1240 | 1227 | ||
1241 | #if defined(CONFIG_M5272) | 1228 | #if defined(CONFIG_M5272) |
1242 | /* | 1229 | /* |
@@ -1789,20 +1776,6 @@ static void __inline__ fec_request_intrs(struct net_device *dev) | |||
1789 | 1776 | ||
1790 | if (request_8xxirq(FEC_INTERRUPT, fec_enet_interrupt, 0, "fec", dev) != 0) | 1777 | if (request_8xxirq(FEC_INTERRUPT, fec_enet_interrupt, 0, "fec", dev) != 0) |
1791 | panic("Could not allocate FEC IRQ!"); | 1778 | panic("Could not allocate FEC IRQ!"); |
1792 | |||
1793 | #ifdef CONFIG_RPXCLASSIC | ||
1794 | /* Make Port C, bit 15 an input that causes interrupts. | ||
1795 | */ | ||
1796 | immap->im_ioport.iop_pcpar &= ~0x0001; | ||
1797 | immap->im_ioport.iop_pcdir &= ~0x0001; | ||
1798 | immap->im_ioport.iop_pcso &= ~0x0001; | ||
1799 | immap->im_ioport.iop_pcint |= 0x0001; | ||
1800 | cpm_install_handler(CPMVEC_PIO_PC15, mii_link_interrupt, dev); | ||
1801 | |||
1802 | /* Make LEDS reflect Link status. | ||
1803 | */ | ||
1804 | *((uint *) RPX_CSR_ADDR) &= ~BCSR2_FETHLEDMODE; | ||
1805 | #endif | ||
1806 | } | 1779 | } |
1807 | 1780 | ||
1808 | static void __inline__ fec_get_mac(struct net_device *dev) | 1781 | static void __inline__ fec_get_mac(struct net_device *dev) |
@@ -1811,16 +1784,6 @@ static void __inline__ fec_get_mac(struct net_device *dev) | |||
1811 | 1784 | ||
1812 | bd = (bd_t *)__res; | 1785 | bd = (bd_t *)__res; |
1813 | memcpy(dev->dev_addr, bd->bi_enetaddr, ETH_ALEN); | 1786 | memcpy(dev->dev_addr, bd->bi_enetaddr, ETH_ALEN); |
1814 | |||
1815 | #ifdef CONFIG_RPXCLASSIC | ||
1816 | /* The Embedded Planet boards have only one MAC address in | ||
1817 | * the EEPROM, but can have two Ethernet ports. For the | ||
1818 | * FEC port, we create another address by setting one of | ||
1819 | * the address bits above something that would have (up to | ||
1820 | * now) been allocated. | ||
1821 | */ | ||
1822 | dev->dev_adrd[3] |= 0x80; | ||
1823 | #endif | ||
1824 | } | 1787 | } |
1825 | 1788 | ||
1826 | static void __inline__ fec_set_mii(struct net_device *dev, struct fec_enet_private *fep) | 1789 | static void __inline__ fec_set_mii(struct net_device *dev, struct fec_enet_private *fep) |
@@ -2099,13 +2062,8 @@ mii_discover_phy(uint mii_reg, struct net_device *dev) | |||
2099 | /* This interrupt occurs when the PHY detects a link change. | 2062 | /* This interrupt occurs when the PHY detects a link change. |
2100 | */ | 2063 | */ |
2101 | #ifdef HAVE_mii_link_interrupt | 2064 | #ifdef HAVE_mii_link_interrupt |
2102 | #ifdef CONFIG_RPXCLASSIC | ||
2103 | static void | ||
2104 | mii_link_interrupt(void *dev_id) | ||
2105 | #else | ||
2106 | static irqreturn_t | 2065 | static irqreturn_t |
2107 | mii_link_interrupt(int irq, void * dev_id) | 2066 | mii_link_interrupt(int irq, void * dev_id) |
2108 | #endif | ||
2109 | { | 2067 | { |
2110 | struct net_device *dev = dev_id; | 2068 | struct net_device *dev = dev_id; |
2111 | struct fec_enet_private *fep = netdev_priv(dev); | 2069 | struct fec_enet_private *fep = netdev_priv(dev); |