From: Zhao Qiang <B45475@freescale.com>
To: <linuxppc-dev@lists.ozlabs.org>, <linux-can@vger.kernel.org>,
<wg@grandegger.com>, <mkl@pengutronix.de>, <B07421@freescale.com>
Cc: Zhao Qiang <B45475@freescale.com>
Subject: [PATCH v3 2/2] flexcan: add err interrupt for p1010rdb
Date: Mon, 23 Jun 2014 15:11:24 +0800 [thread overview]
Message-ID: <1403507484-46547-2-git-send-email-B45475@freescale.com> (raw)
In-Reply-To: <1403507484-46547-1-git-send-email-B45475@freescale.com>
add err interrupt for p1010rdb into dts.
Signed-off-by: Zhao Qiang <B45475@freescale.com>
---
Changes for v2:
- add binding documentation update
Changes for v3:
- update binding documentation
Documentation/devicetree/bindings/net/can/fsl-flexcan.txt | 15 +++++++++++++--
arch/powerpc/boot/dts/fsl/p1010si-post.dtsi | 6 ++++--
2 files changed, 17 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..7bf377c 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(optional) is for error
Optional properties:
@@ -23,7 +25,16 @@ Example:
can@1c000 {
compatible = "fsl,p1010-flexcan";
reg = <0x1c000 0x1000>;
- interrupts = <48 0x2>;
+ interrupts = <48 0x2 0 0>;
+ interrupt-parent = <&mpic>;
+ clock-frequency = <200000000>; // filled in by bootloader
+ };
+
+ can@1c000 {
+ compatible = "fsl,p1010-flexcan";
+ reg = <0x1c000 0x1000>;
+ 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 {
--
1.8.5
next prev parent reply other threads:[~2014-06-23 7:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-23 7:11 [PATCH v3 1/2] flexcan: add err_irq handler for flexcan Zhao Qiang
2014-06-23 7:11 ` Zhao Qiang [this message]
2014-06-23 7:17 ` Marc Kleine-Budde
2014-06-23 7:26 ` qiang.zhao
2014-06-23 7:37 ` Marc Kleine-Budde
2014-06-23 8:15 ` qiang.zhao
2014-06-23 8:31 ` Marc Kleine-Budde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1403507484-46547-2-git-send-email-B45475@freescale.com \
--to=b45475@freescale.com \
--cc=B07421@freescale.com \
--cc=linux-can@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mkl@pengutronix.de \
--cc=wg@grandegger.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).