Skip to content

Commit

Permalink
powerpc/qman: Change fsl,qman-channel-id to cell-index
Browse files Browse the repository at this point in the history
It turns out that existing U-Boots will dereference NULL pointers
if the device tree does not have cell-index in the portal nodes.

No patch has yet been merged adding device tree nodes for this binding
(except a dtsi that has not yet been referenced), nor has any driver
yet been merged making use of the binding, so it's not too late to
change the binding in order to keep compatibility with existing
U-Boots.

Signed-off-by: Scott Wood <[email protected]>
Cc: Madalin-Cristian Bucur <[email protected]>
  • Loading branch information
Scott Wood committed Jun 3, 2015
1 parent 6c0cc62 commit e9326de
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/soc/fsl/qman-portals.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ PROPERTIES

For additional details about the PAMU/LIODN binding(s) see pamu.txt

- fsl,qman-channel-id
- cell-index
Usage: Required
Value type: <u32>
Definition: The hardware index of the channel. This can also be
Expand Down Expand Up @@ -136,7 +136,7 @@ The example below shows a (P4080) QMan portals container/bus node with two porta
reg = <0x4000 0x4000>, <0x101000 0x1000>;
interrupts = <106 2 0 0>;
fsl,liodn = <3 4>;
fsl,qman-channel-id = <1>;
cell-index = <1>;

fman0 {
fsl,liodn = <0x22>;
Expand Down

0 comments on commit e9326de

Please sign in to comment.