diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-04-08 03:01:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-04-08 03:01:54 -0400 |
| commit | 4bcc7827b02feea2c762fa6d46a1bffb300d7403 (patch) | |
| tree | 45fd2b64247cd44201fe519720494d4bf01b7014 /Documentation/devicetree/bindings/net | |
| parent | 3f705dfdf85a6416f5f12e52b7610144a99cbedc (diff) | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
Merge tag 'v4.0-rc7' into x86/asm, to resolve conflicts
Conflicts:
arch/x86/kernel/entry_64.S
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/net')
| -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 | |||
| 19 | (DSA_MAX_SWITCHES). | 19 | (DSA_MAX_SWITCHES). |
| 20 | Each of these switch child nodes should have the following required properties: | 20 | Each of these switch child nodes should have the following required properties: |
| 21 | 21 | ||
| 22 | - reg : Describes the switch address on the MII bus | 22 | - reg : Contains two fields. The first one describes the |
| 23 | address on the MII bus. The second is the switch | ||
| 24 | number that must be unique in cascaded configurations | ||
| 23 | - #address-cells : Must be 1 | 25 | - #address-cells : Must be 1 |
| 24 | - #size-cells : Must be 0 | 26 | - #size-cells : Must be 0 |
| 25 | 27 | ||