| Message ID | 1403229664-33912-2-git-send-email-B45475@freescale.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On 06/20/2014 04:01 AM, Zhao Qiang wrote: > add err interrupt for p1010rdb into dts. > > Signed-off-by: Zhao Qiang <B45475@freescale.com> > --- > Changes for v2: > - add binding documentation update > > Documentation/devicetree/bindings/net/can/fsl-flexcan.txt | 7 +++++-- > arch/powerpc/boot/dts/fsl/p1010si-post.dtsi | 6 ++++-- > 2 files changed, 9 insertions(+), 4 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt > index 56d6cc3..81929e5 100644 > --- a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt > +++ b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt > @@ -10,7 +10,9 @@ Required properties: > - fsl,p1010-flexcan > > - reg : Offset and length of the register set for this device > -- interrupts : Interrupt tuple for this device > +- interrupts : Interrupt tuple for this device. > + The first interrupt is for FlexCAN(Message Buffer and Wake Up) > + The second is for error(Shared with IFC, PEX1 and some other device) The second interrupt is optional, at least on ARM we don't need it, please reflect this in the documentation update. Marc
On Fri, 2014-06-20 at 10:52 +0200, Marc Kleine-Budde wrote: > On 06/20/2014 04:01 AM, Zhao Qiang wrote: > > add err interrupt for p1010rdb into dts. > > > > Signed-off-by: Zhao Qiang <B45475@freescale.com> > > --- > > Changes for v2: > > - add binding documentation update > > > > Documentation/devicetree/bindings/net/can/fsl-flexcan.txt | 7 +++++-- > > arch/powerpc/boot/dts/fsl/p1010si-post.dtsi | 6 ++++-- > > 2 files changed, 9 insertions(+), 4 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt > > index 56d6cc3..81929e5 100644 > > --- a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt > > +++ b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt > > @@ -10,7 +10,9 @@ Required properties: > > - fsl,p1010-flexcan > > > > - reg : Offset and length of the register set for this device > > -- interrupts : Interrupt tuple for this device > > +- interrupts : Interrupt tuple for this device. > > + The first interrupt is for FlexCAN(Message Buffer and Wake Up) > > + The second is for error(Shared with IFC, PEX1 and some other device) > > The second interrupt is optional, at least on ARM we don't need it, > please reflect this in the documentation update. The binding also shouldn't specify that the interrupt is shared, much less with specific things. It's not relevant, and may not be universally true. -Scott
diff --git a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt index 56d6cc3..81929e5 100644 --- a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt +++ b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt @@ -10,7 +10,9 @@ Required properties: - fsl,p1010-flexcan - reg : Offset and length of the register set for this device -- interrupts : Interrupt tuple for this device +- interrupts : Interrupt tuple for this device. + The first interrupt is for FlexCAN(Message Buffer and Wake Up) + The second is for error(Shared with IFC, PEX1 and some other device) Optional properties: @@ -23,7 +25,8 @@ Example: can@1c000 { compatible = "fsl,p1010-flexcan"; reg = <0x1c000 0x1000>; - interrupts = <48 0x2>; + interrupts = <48 0x2 0 0 + 16 0x2 0 0>; interrupt-parent = <&mpic>; clock-frequency = <200000000>; // filled in by bootloader }; diff --git a/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi index af12ead..47125a6 100644 --- a/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi @@ -136,13 +136,15 @@ can0: can@1c000 { compatible = "fsl,p1010-flexcan"; reg = <0x1c000 0x1000>; - interrupts = <48 0x2 0 0>; + interrupts = <48 0x2 0 0 + 16 0x2 0 0>; }; can1: can@1d000 { compatible = "fsl,p1010-flexcan"; reg = <0x1d000 0x1000>; - interrupts = <61 0x2 0 0>; + interrupts = <61 0x2 0 0 + 16 0x2 0 0>; }; L2: l2-cache-controller@20000 {
add err interrupt for p1010rdb into dts. Signed-off-by: Zhao Qiang <B45475@freescale.com> --- Changes for v2: - add binding documentation update Documentation/devicetree/bindings/net/can/fsl-flexcan.txt | 7 +++++-- arch/powerpc/boot/dts/fsl/p1010si-post.dtsi | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-)