Commit 6c36a707 authored by frederic RODO's avatar frederic RODO Committed by Jeff Garzik

macb: Use generic PHY layer

Convert the macb driver to use the generic PHY layer in
drivers/net/phy.
Signed-off-by: default avatarFrederic RODO <f.rodo@til-technologies.fr>
Signed-off-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 54ab2927
...@@ -187,7 +187,7 @@ config MII ...@@ -187,7 +187,7 @@ config MII
config MACB config MACB
tristate "Atmel MACB support" tristate "Atmel MACB support"
depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263
select MII select PHYLIB
help help
The Atmel MACB ethernet interface is found on many AT32 and AT91 The Atmel MACB ethernet interface is found on many AT32 and AT91
parts. Say Y to include support for the MACB chip. parts. Say Y to include support for the MACB chip.
......
This diff is collapsed.
...@@ -383,11 +383,11 @@ struct macb { ...@@ -383,11 +383,11 @@ struct macb {
unsigned int rx_pending, tx_pending; unsigned int rx_pending, tx_pending;
struct delayed_work periodic_task; struct mii_bus mii_bus;
struct phy_device *phy_dev;
struct mutex mdio_mutex; unsigned int link;
struct completion mdio_complete; unsigned int speed;
struct mii_if_info mii; unsigned int duplex;
}; };
#endif /* _MACB_H */ #endif /* _MACB_H */
...@@ -64,6 +64,7 @@ extern void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) ...@@ -64,6 +64,7 @@ extern void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
/* Ethernet (EMAC & MACB) */ /* Ethernet (EMAC & MACB) */
struct at91_eth_data { struct at91_eth_data {
u32 phy_mask;
u8 phy_irq_pin; /* PHY IRQ */ u8 phy_irq_pin; /* PHY IRQ */
u8 is_rmii; /* using RMII interface? */ u8 is_rmii; /* using RMII interface? */
}; };
......
...@@ -21,6 +21,7 @@ void at32_map_usart(unsigned int hw_id, unsigned int line); ...@@ -21,6 +21,7 @@ void at32_map_usart(unsigned int hw_id, unsigned int line);
struct platform_device *at32_add_device_usart(unsigned int id); struct platform_device *at32_add_device_usart(unsigned int id);
struct eth_platform_data { struct eth_platform_data {
u32 phy_mask;
u8 is_rmii; u8 is_rmii;
}; };
struct platform_device * struct platform_device *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment