Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2...

[pandora-kernel.git] / include / linux / phy.h

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 72cb67b..9447a57 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -53,6 +53,9 @@
 
 #define PHY_MAX_ADDR 32
 
+/* Used when trying to connect to a specific phy (mii bus id:phy device id) */
+#define PHY_ID_FMT "%x:%02x"
+
 /* The Bus class for PHYs.  Devices which provide access to
  * PHYs should register using this structure */
 struct mii_bus {
@@ -72,6 +75,9 @@ struct mii_bus {
        /* list of all PHYs on bus */
        struct phy_device *phy_map[PHY_MAX_ADDR];
 
+       /* Phy addresses to be ignored when probing */
+       u32 phy_mask;
+
        /* Pointer to an array of interrupts, each PHY's
         * interrupt at the index matching its address */
        int *irq;
@@ -372,6 +378,7 @@ int phy_mii_ioctl(struct phy_device *phydev,
                struct mii_ioctl_data *mii_data, int cmd);
 int phy_start_interrupts(struct phy_device *phydev);
 void phy_print_status(struct phy_device *phydev);
+struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id);
 
 extern struct bus_type mdio_bus_type;
 #endif /* __PHY_H */