diff options
| author | Dmitry Torokhov | 2015-04-07 17:46:23 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2015-04-07 17:46:23 +0200 |
| commit | 5f63e885ac32429fc1340f5a61e1484022efc773 (patch) | |
| tree | f9a21a6902e1857274775b96d561d8be17287860 /Documentation/devicetree | |
| parent | Input: atmel_mxt_ts - split out touchpad initialisation logic (diff) | |
| parent | Linux 4.0-rc7 (diff) | |
| download | kernel-qcow2-linux-5f63e885ac32429fc1340f5a61e1484022efc773.tar.gz kernel-qcow2-linux-5f63e885ac32429fc1340f5a61e1484022efc773.tar.xz kernel-qcow2-linux-5f63e885ac32429fc1340f5a61e1484022efc773.zip | |
Merge tag 'v4.0-rc7' into next
Sync up with Linux 4.0-rc7 to bring in ALPS changes.
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/net/dsa/dsa.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/dsa/dsa.txt b/Documentation/devicetree/bindings/net/dsa/dsa.txt index e124847443f8..f0b4cd72411d 100644 --- a/Documentation/devicetree/bindings/net/dsa/dsa.txt +++ b/Documentation/devicetree/bindings/net/dsa/dsa.txt @@ -19,7 +19,9 @@ the parent DSA node. The maximum number of allowed child nodes is 4 (DSA_MAX_SWITCHES). Each of these switch child nodes should have the following required properties: -- reg : Describes the switch address on the MII bus +- reg : Contains two fields. The first one describes the + address on the MII bus. The second is the switch + number that must be unique in cascaded configurations - #address-cells : Must be 1 - #size-cells : Must be 0 |