From patchwork Mon Jun 23 07:11:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Qiang X-Patchwork-Id: 362678 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1240D14008D for ; Mon, 23 Jun 2014 17:16:11 +1000 (EST) Received: from ozlabs.org (ozlabs.org [103.22.144.67]) by lists.ozlabs.org (Postfix) with ESMTP id 0144F1A0156 for ; Mon, 23 Jun 2014 17:16:11 +1000 (EST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2lp0240.outbound.protection.outlook.com [207.46.163.240]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id A66A21A017A for ; Mon, 23 Jun 2014 17:14:54 +1000 (EST) Received: from BN3PR0301CA0078.namprd03.prod.outlook.com (25.160.152.174) by BLUPR03MB341.namprd03.prod.outlook.com (10.141.48.12) with Microsoft SMTP Server (TLS) id 15.0.969.15; Mon, 23 Jun 2014 07:14:48 +0000 Received: from BY2FFO11FD018.protection.gbl (2a01:111:f400:7c0c::146) by BN3PR0301CA0078.outlook.office365.com (2a01:111:e400:401e::46) with Microsoft SMTP Server (TLS) id 15.0.969.15 via Frontend Transport; Mon, 23 Jun 2014 07:14:48 +0000 Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD018.mail.protection.outlook.com (10.1.14.106) with Microsoft SMTP Server (TLS) id 15.0.969.12 via Frontend Transport; Mon, 23 Jun 2014 07:14:46 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id s5N7Ebrx008742; Mon, 23 Jun 2014 00:14:44 -0700 From: Zhao Qiang To: , , , , Subject: [PATCH v3 2/2] flexcan: add err interrupt for p1010rdb Date: Mon, 23 Jun 2014 15:11:24 +0800 Message-ID: <1403507484-46547-2-git-send-email-B45475@freescale.com> X-Mailer: git-send-email 1.8.5 In-Reply-To: <1403507484-46547-1-git-send-email-B45475@freescale.com> References: <1403507484-46547-1-git-send-email-B45475@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(6009001)(199002)(189002)(74662001)(44976005)(47776003)(20776003)(106466001)(46102001)(36756003)(102836001)(48376002)(50986999)(31966008)(84676001)(85306003)(105606002)(83322001)(104016002)(76482001)(64706001)(95666004)(80022001)(81542001)(77982001)(26826002)(6806004)(77156001)(4396001)(62966002)(87286001)(81342001)(92566001)(2201001)(87936001)(21056001)(79102001)(104166001)(19580405001)(74502001)(99396002)(92726001)(76176999)(50226001)(68736004)(19580395003)(83072002)(85852003)(88136002)(97736001)(50466002)(89996001)(93916002)(42262001)(2101003); DIR:OUT; SFP:; SCL:1; SRVR:BLUPR03MB341; H:tx30smr01.am.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID: X-Forefront-PRVS: 025100C802 Received-SPF: Fail (: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=qiang.zhao@freescale.com; X-OriginatorOrg: freescale.com Cc: Zhao Qiang X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" add err interrupt for p1010rdb into dts. Signed-off-by: Zhao Qiang --- 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 {