diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mv643xx_eth.h | 16 | ||||
| -rw-r--r-- | include/linux/phy.h | 5 |
2 files changed, 19 insertions, 2 deletions
diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h index 30e11aa3c1c9..a15cdd4a8e58 100644 --- a/include/linux/mv643xx_eth.h +++ b/include/linux/mv643xx_eth.h | |||
| @@ -1,19 +1,31 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * MV-643XX ethernet platform device data definition file. | 2 | * MV-643XX ethernet platform device data definition file. |
| 3 | */ | 3 | */ |
| 4 | |||
| 4 | #ifndef __LINUX_MV643XX_ETH_H | 5 | #ifndef __LINUX_MV643XX_ETH_H |
| 5 | #define __LINUX_MV643XX_ETH_H | 6 | #define __LINUX_MV643XX_ETH_H |
| 6 | 7 | ||
| 7 | #define MV643XX_ETH_SHARED_NAME "mv643xx_eth_shared" | 8 | #include <linux/mbus.h> |
| 8 | #define MV643XX_ETH_NAME "mv643xx_eth" | 9 | |
| 10 | #define MV643XX_ETH_SHARED_NAME "mv643xx_eth" | ||
| 11 | #define MV643XX_ETH_NAME "mv643xx_eth_port" | ||
| 9 | #define MV643XX_ETH_SHARED_REGS 0x2000 | 12 | #define MV643XX_ETH_SHARED_REGS 0x2000 |
| 10 | #define MV643XX_ETH_SHARED_REGS_SIZE 0x2000 | 13 | #define MV643XX_ETH_SHARED_REGS_SIZE 0x2000 |
| 11 | #define MV643XX_ETH_BAR_4 0x2220 | 14 | #define MV643XX_ETH_BAR_4 0x2220 |
| 12 | #define MV643XX_ETH_SIZE_REG_4 0x2224 | 15 | #define MV643XX_ETH_SIZE_REG_4 0x2224 |
| 13 | #define MV643XX_ETH_BASE_ADDR_ENABLE_REG 0x2290 | 16 | #define MV643XX_ETH_BASE_ADDR_ENABLE_REG 0x2290 |
| 14 | 17 | ||
| 18 | struct mv643xx_eth_shared_platform_data { | ||
| 19 | struct mbus_dram_target_info *dram; | ||
| 20 | unsigned int t_clk; | ||
| 21 | }; | ||
| 22 | |||
| 15 | struct mv643xx_eth_platform_data { | 23 | struct mv643xx_eth_platform_data { |
| 24 | struct platform_device *shared; | ||
| 16 | int port_number; | 25 | int port_number; |
| 26 | |||
| 27 | struct platform_device *shared_smi; | ||
| 28 | |||
| 17 | u16 force_phy_addr; /* force override if phy_addr == 0 */ | 29 | u16 force_phy_addr; /* force override if phy_addr == 0 */ |
| 18 | u16 phy_addr; | 30 | u16 phy_addr; |
| 19 | 31 | ||
diff --git a/include/linux/phy.h b/include/linux/phy.h index 02df20f085fe..7224c4099a28 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h | |||
| @@ -412,6 +412,8 @@ int mdiobus_register(struct mii_bus *bus); | |||
| 412 | void mdiobus_unregister(struct mii_bus *bus); | 412 | void mdiobus_unregister(struct mii_bus *bus); |
| 413 | void phy_sanitize_settings(struct phy_device *phydev); | 413 | void phy_sanitize_settings(struct phy_device *phydev); |
| 414 | int phy_stop_interrupts(struct phy_device *phydev); | 414 | int phy_stop_interrupts(struct phy_device *phydev); |
| 415 | int phy_enable_interrupts(struct phy_device *phydev); | ||
| 416 | int phy_disable_interrupts(struct phy_device *phydev); | ||
| 415 | 417 | ||
| 416 | static inline int phy_read_status(struct phy_device *phydev) { | 418 | static inline int phy_read_status(struct phy_device *phydev) { |
| 417 | return phydev->drv->read_status(phydev); | 419 | return phydev->drv->read_status(phydev); |
| @@ -447,5 +449,8 @@ int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask, | |||
| 447 | int (*run)(struct phy_device *)); | 449 | int (*run)(struct phy_device *)); |
| 448 | int phy_scan_fixups(struct phy_device *phydev); | 450 | int phy_scan_fixups(struct phy_device *phydev); |
| 449 | 451 | ||
| 452 | int __init mdio_bus_init(void); | ||
| 453 | void mdio_bus_exit(void); | ||
| 454 | |||
| 450 | extern struct bus_type mdio_bus_type; | 455 | extern struct bus_type mdio_bus_type; |
| 451 | #endif /* __PHY_H */ | 456 | #endif /* __PHY_H */ |
