diff options
Diffstat (limited to 'arch/ppc/8260_io/fcc_enet.c')
-rw-r--r-- | arch/ppc/8260_io/fcc_enet.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c index bcc3aa9d04f3..d38b57e24cee 100644 --- a/arch/ppc/8260_io/fcc_enet.c +++ b/arch/ppc/8260_io/fcc_enet.c | |||
@@ -165,9 +165,6 @@ static int fcc_enet_set_mac_address(struct net_device *dev, void *addr); | |||
165 | #ifdef CONFIG_SBC82xx | 165 | #ifdef CONFIG_SBC82xx |
166 | #define F1_RXCLK 9 | 166 | #define F1_RXCLK 9 |
167 | #define F1_TXCLK 10 | 167 | #define F1_TXCLK 10 |
168 | #elif defined(CONFIG_ADS8272) | ||
169 | #define F1_RXCLK 11 | ||
170 | #define F1_TXCLK 10 | ||
171 | #else | 168 | #else |
172 | #define F1_RXCLK 12 | 169 | #define F1_RXCLK 12 |
173 | #define F1_TXCLK 11 | 170 | #define F1_TXCLK 11 |
@@ -175,13 +172,8 @@ static int fcc_enet_set_mac_address(struct net_device *dev, void *addr); | |||
175 | 172 | ||
176 | /* FCC2 Clock Source Configuration. There are board specific. | 173 | /* FCC2 Clock Source Configuration. There are board specific. |
177 | Can only choose from CLK13-16 */ | 174 | Can only choose from CLK13-16 */ |
178 | #ifdef CONFIG_ADS8272 | ||
179 | #define F2_RXCLK 15 | ||
180 | #define F2_TXCLK 16 | ||
181 | #else | ||
182 | #define F2_RXCLK 13 | 175 | #define F2_RXCLK 13 |
183 | #define F2_TXCLK 14 | 176 | #define F2_TXCLK 14 |
184 | #endif | ||
185 | 177 | ||
186 | /* FCC3 Clock Source Configuration. There are board specific. | 178 | /* FCC3 Clock Source Configuration. There are board specific. |
187 | Can only choose from CLK13-16 */ | 179 | Can only choose from CLK13-16 */ |
@@ -289,10 +281,7 @@ static int fcc_enet_set_mac_address(struct net_device *dev, void *addr); | |||
289 | /* TQM8260 has MDIO and MDCK on PC30 and PC31 respectively */ | 281 | /* TQM8260 has MDIO and MDCK on PC30 and PC31 respectively */ |
290 | #define PC_MDIO ((uint)0x00000002) | 282 | #define PC_MDIO ((uint)0x00000002) |
291 | #define PC_MDCK ((uint)0x00000001) | 283 | #define PC_MDCK ((uint)0x00000001) |
292 | #elif defined(CONFIG_ADS8272) | 284 | #elif defined(CONFIG_EST8260) || defined(CONFIG_ADS8260) |
293 | #define PC_MDIO ((uint)0x00002000) | ||
294 | #define PC_MDCK ((uint)0x00001000) | ||
295 | #elif defined(CONFIG_EST8260) || defined(CONFIG_ADS8260) || defined(CONFIG_PQ2FADS) | ||
296 | #define PC_MDIO ((uint)0x00400000) | 285 | #define PC_MDIO ((uint)0x00400000) |
297 | #define PC_MDCK ((uint)0x00200000) | 286 | #define PC_MDCK ((uint)0x00200000) |
298 | #else | 287 | #else |
@@ -2118,11 +2107,6 @@ init_fcc_startup(fcc_info_t *fip, struct net_device *dev) | |||
2118 | printk("Can't get FCC IRQ %d\n", fip->fc_interrupt); | 2107 | printk("Can't get FCC IRQ %d\n", fip->fc_interrupt); |
2119 | 2108 | ||
2120 | #ifdef PHY_INTERRUPT | 2109 | #ifdef PHY_INTERRUPT |
2121 | #ifdef CONFIG_ADS8272 | ||
2122 | if (request_irq(PHY_INTERRUPT, mii_link_interrupt, IRQF_SHARED, | ||
2123 | "mii", dev) < 0) | ||
2124 | printk(KERN_CRIT "Can't get MII IRQ %d\n", PHY_INTERRUPT); | ||
2125 | #else | ||
2126 | /* Make IRQn edge triggered. This does not work if PHY_INTERRUPT is | 2110 | /* Make IRQn edge triggered. This does not work if PHY_INTERRUPT is |
2127 | * on Port C. | 2111 | * on Port C. |
2128 | */ | 2112 | */ |
@@ -2132,7 +2116,6 @@ init_fcc_startup(fcc_info_t *fip, struct net_device *dev) | |||
2132 | if (request_irq(PHY_INTERRUPT, mii_link_interrupt, 0, | 2116 | if (request_irq(PHY_INTERRUPT, mii_link_interrupt, 0, |
2133 | "mii", dev) < 0) | 2117 | "mii", dev) < 0) |
2134 | printk(KERN_CRIT "Can't get MII IRQ %d\n", PHY_INTERRUPT); | 2118 | printk(KERN_CRIT "Can't get MII IRQ %d\n", PHY_INTERRUPT); |
2135 | #endif | ||
2136 | #endif /* PHY_INTERRUPT */ | 2119 | #endif /* PHY_INTERRUPT */ |
2137 | 2120 | ||
2138 | /* Set GFMR to enable Ethernet operating mode. | 2121 | /* Set GFMR to enable Ethernet operating mode. |