1 files changed, 33 insertions, 5 deletions

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 6a7eb402165d..6b0a782c6224 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -24,6 +24,7 @@
 #include <linux/mii.h>
 #include <linux/timer.h>
 #include <linux/workqueue.h>
+#include <linux/mod_devicetable.h>
 
 #include <asm/atomic.h>
 
@@ -81,6 +82,10 @@ typedef enum {
  */
 #define MII_BUS_ID_SIZE (20 - 3)
 
+/* Or MII_ADDR_C45 into regnum for read/write on mii_bus to enable the 21 bit
+   IEEE 802.3ae clause 45 addressing mode used by 10GIGE phy chips. */
+#define MII_ADDR_C45 (1<<30)
+
 /*
  * The Bus class for PHYs.  Devices which provide access to
  * PHYs should register using this structure
@@ -127,8 +132,8 @@ int mdiobus_register(struct mii_bus *bus);
 void mdiobus_unregister(struct mii_bus *bus);
 void mdiobus_free(struct mii_bus *bus);
 struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr);
-int mdiobus_read(struct mii_bus *bus, int addr, u16 regnum);
-int mdiobus_write(struct mii_bus *bus, int addr, u16 regnum, u16 val);
+int mdiobus_read(struct mii_bus *bus, int addr, u32 regnum);
+int mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val);
 
 
 #define PHY_INTERRUPT_DISABLED  0x0
@@ -229,6 +234,8 @@ enum phy_state {
         PHY_RESUMING
 };
 
+struct sk_buff;
+
 /* phy_device: An instance of a PHY
  *
  * drv: Pointer to the driver for this PHY instance
@@ -397,6 +404,26 @@ struct phy_driver {
         /* Clears up any memory if needed */
         void (*remove)(struct phy_device *phydev);
 
+        /* Handles SIOCSHWTSTAMP ioctl for hardware time stamping. */
+        int  (*hwtstamp)(struct phy_device *phydev, struct ifreq *ifr);
+
+        /*
+         * Requests a Rx timestamp for 'skb'. If the skb is accepted,
+         * the phy driver promises to deliver it using netif_rx() as
+         * soon as a timestamp becomes available. One of the
+         * PTP_CLASS_ values is passed in 'type'. The function must
+         * return true if the skb is accepted for delivery.
+         */
+        bool (*rxtstamp)(struct phy_device *dev, struct sk_buff *skb, int type);
+
+        /*
+         * Requests a Tx timestamp for 'skb'. The phy driver promises
+         * to deliver it to the socket's error queue as soon as a
+         * timestamp becomes available. One of the PTP_CLASS_ values
+         * is passed in 'type'.
+         */
+        void (*txtstamp)(struct phy_device *dev, struct sk_buff *skb, int type);
+
         struct device_driver driver;
 };
 #define to_phy_driver(d) container_of(d, struct phy_driver, driver)
@@ -422,7 +449,7 @@ struct phy_fixup {
  * because the bus read/write functions may wait for an interrupt
  * to conclude the operation.
  */
-static inline int phy_read(struct phy_device *phydev, u16 regnum)
+static inline int phy_read(struct phy_device *phydev, u32 regnum)
 {
         return mdiobus_read(phydev->bus, phydev->addr, regnum);
 }
@@ -437,7 +464,7 @@ static inline int phy_read(struct phy_device *phydev, u16 regnum)
  * because the bus read/write functions may wait for an interrupt
  * to conclude the operation.
  */
-static inline int phy_write(struct phy_device *phydev, u16 regnum, u16 val)
+static inline int phy_write(struct phy_device *phydev, u32 regnum, u16 val)
 {
         return mdiobus_write(phydev->bus, phydev->addr, regnum, val);
 }
@@ -452,6 +479,7 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
                 u32 flags, phy_interface_t interface);
 struct phy_device * phy_attach(struct net_device *dev,
                 const char *bus_id, u32 flags, phy_interface_t interface);
+struct phy_device *phy_find_first(struct mii_bus *bus);
 int phy_connect_direct(struct net_device *dev, struct phy_device *phydev,
                 void (*handler)(struct net_device *), u32 flags,
                 phy_interface_t interface);
@@ -492,7 +520,7 @@ void phy_stop_machine(struct phy_device *phydev);
 int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
 int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
 int phy_mii_ioctl(struct phy_device *phydev,
-                struct mii_ioctl_data *mii_data, int cmd);
+                struct ifreq *ifr, 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);