aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/net/sff,sfp.txt
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-05-23 14:34:28 -0400
committerDavid S. Miller <davem@davemloft.net>2018-05-23 14:34:28 -0400
commite89e59c08d1bc736c8f593d7bad0706b20e73f30 (patch)
tree580a061017e14731a212838e8ba0eb663bcc2973 /Documentation/devicetree/bindings/net/sff,sfp.txt
parentMerge branch 'nfp-abm-add-basic-support-for-advanced-buffering-NIC' (diff)
parentDocumentation/bindings: net: the sfp i2c-bus property is now mandatory (diff)
downloadlinux-dev-e89e59c08d1bc736c8f593d7bad0706b20e73f30.tar.xz
linux-dev-e89e59c08d1bc736c8f593d7bad0706b20e73f30.zip
Merge branch 'net-sfp-small-improvements'
Antoine Tenart says: ==================== net: sfp: small improvements A small series of patches improving the SFP support by adding a warning when no Tx disable pin is available, and making the i2c-bus property mandatory. Thanks! Antoine Since v1: - Removed the patch fixing the sfp driver when no i2c bus was described. - Made two new patches to make the i2c-bus property mandatory for sfp modules. Since the phylink series: - s/-EOPNOTSUPP/-ENODEV/ in patch 1/2. - I added the acked-by tag in patch 2/2. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/devicetree/bindings/net/sff,sfp.txt')
-rw-r--r--Documentation/devicetree/bindings/net/sff,sfp.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/net/sff,sfp.txt b/Documentation/devicetree/bindings/net/sff,sfp.txt
index 929591d52ed6..832139919f20 100644
--- a/Documentation/devicetree/bindings/net/sff,sfp.txt
+++ b/Documentation/devicetree/bindings/net/sff,sfp.txt
@@ -7,11 +7,11 @@ Required properties:
"sff,sfp" for SFP modules
"sff,sff" for soldered down SFF modules
-Optional Properties:
-
- i2c-bus : phandle of an I2C bus controller for the SFP two wire serial
interface
+Optional Properties:
+
- mod-def0-gpios : GPIO phandle and a specifier of the MOD-DEF0 (AKA Mod_ABS)
module presence input gpio signal, active (module absent) high. Must
not be present for SFF modules