Documentation: net-sysfs: Remove duplicate PHY device documentation

Both sysfs-bus-mdio and sysfs-class-net-phydev contain the same
duplication information. There is not currently any MDIO bus specific
attribute, but there are PHY device (struct phy_device) specific
attributes. Use the more precise description from sysfs-bus-mdio and
carry that over to sysfs-class-net-phydev.

Fixes: 86f22d04dfb5 ("net: sysfs: Document PHY device sysfs attributes")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/Documentation/ABI/testing/sysfs-bus-mdio b/Documentation/ABI/testing/sysfs-bus-mdio
deleted file mode 100644 (file)
index 491baaf..0000000
--- a/Documentation/ABI/testing/sysfs-bus-mdio
+++ /dev/null
@@ -1,29 +0,0 @@
-What:          /sys/bus/mdio_bus/devices/.../phy_id
-Date:          November 2012
-KernelVersion: 3.8
-Contact:       netdev@vger.kernel.org
-Description:
-               This attribute contains the 32-bit PHY Identifier as reported
-               by the device during bus enumeration, encoded in hexadecimal.
-               This ID is used to match the device with the appropriate
-               driver.
-
-What:          /sys/bus/mdio_bus/devices/.../phy_interface
-Date:          February 2014
-KernelVersion: 3.15
-Contact:       netdev@vger.kernel.org
-Description:
-               This attribute contains the PHY interface as configured by the
-               Ethernet driver during bus enumeration, encoded in string.
-               This interface mode is used to configure the Ethernet MAC with the
-               appropriate mode for its data lines to the PHY hardware.
-
-What:          /sys/bus/mdio_bus/devices/.../phy_has_fixups
-Date:          February 2014
-KernelVersion: 3.15
-Contact:       netdev@vger.kernel.org
-Description:
-               This attribute contains the boolean value whether a given PHY
-               device has had any "fixup" workaround running on it, encoded as
-               a boolean. This information is provided to help troubleshooting
-               PHY configurations.

diff --git a/Documentation/ABI/testing/sysfs-class-net-phydev b/Documentation/ABI/testing/sysfs-class-net-phydev
index 6ebabfb279129a16b403fcc2059fb2d1523098d9..2a5723343aba78ce576d6fb6fcf2556071c5d720 100644 (file)
--- a/Documentation/ABI/testing/sysfs-class-net-phydev
+++ b/Documentation/ABI/testing/sysfs-class-net-phydev
@@ -11,24 +11,31 @@ Date:               February 2014
 KernelVersion: 3.15
 Contact:       netdev@vger.kernel.org
 Description:
-               Boolean value indicating whether the PHY device has
-               any fixups registered against it (phy_register_fixup)
+               This attribute contains the boolean value whether a given PHY
+               device has had any "fixup" workaround running on it, encoded as
+               a boolean. This information is provided to help troubleshooting
+               PHY configurations.
 
 What:          /sys/class/mdio_bus/<bus>/<device>/phy_id
 Date:          November 2012
 KernelVersion: 3.8
 Contact:       netdev@vger.kernel.org
 Description:
-               32-bit hexadecimal value corresponding to the PHY device's OUI,
-               model and revision number.
+               This attribute contains the 32-bit PHY Identifier as reported
+               by the device during bus enumeration, encoded in hexadecimal.
+               This ID is used to match the device with the appropriate
+               driver.
 
 What:          /sys/class/mdio_bus/<bus>/<device>/phy_interface
 Date:          February 2014
 KernelVersion: 3.15
 Contact:       netdev@vger.kernel.org
 Description:
-               String value indicating the PHY interface, possible
-               values are:.
+               This attribute contains the PHY interface as configured by the
+               Ethernet driver during bus enumeration, encoded in string.
+               This interface mode is used to configure the Ethernet MAC with the
+               appropriate mode for its data lines to the PHY hardware.
+               Possible values are:
                <empty> (not available), mii, gmii, sgmii, tbi, rev-mii,
                rmii, rgmii, rgmii-id, rgmii-rxid, rgmii-txid, rtbi, smii
                xgmii, moca, qsgmii, trgmii, 1000base-x, 2500base-x, rxaui,