diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-04-09 07:48:27 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-04-09 07:48:27 +1000 |
| commit | 1d8ac08d498d579aae36221a80b4b724b2f52f39 (patch) | |
| tree | 3177ed7b82edbb34055da95c50b418db5cd4ba60 /Documentation/devicetree | |
| parent | 5c7f0c27956a9884e29dbe5f83e56609fa00290f (diff) | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
Merge tag 'v4.0-rc7' into drm-next
Linux 4.0-rc7
Requested by Alex for fixes -next needs.
Conflicts:
drivers/gpu/drm/i915/intel_sprite.c
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 |