From patchwork Fri Jun 8 18:57:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 163845 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B5274B6FA5 for ; Sat, 9 Jun 2012 05:00:23 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sd4N6-0003cB-24; Fri, 08 Jun 2012 18:57:20 +0000 Received: from mail-out.m-online.net ([2001:a60:0:70:0:1:25:1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Sd4N2-0003bD-1L for linux-arm-kernel@lists.infradead.org; Fri, 08 Jun 2012 18:57:16 +0000 Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3W8CXn4qThz4Kh14; Fri, 8 Jun 2012 20:57:13 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id 3W8CXn4PV7z4KK5k; Fri, 8 Jun 2012 20:57:13 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from smtp-auth.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.8.164]) (amavisd-new, port 10024) with ESMTP id jpADrUMDa+u1; Fri, 8 Jun 2012 20:57:13 +0200 (CEST) Received: from mashiro.lan (unknown [195.140.253.167]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA; Fri, 8 Jun 2012 20:57:12 +0200 (CEST) From: Marek Vasut To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] MXS: Enable FLEXCAN for MXS/DT Date: Fri, 8 Jun 2012 20:57:10 +0200 Message-Id: <1339181830-22863-1-git-send-email-marex@denx.de> X-Mailer: git-send-email 1.7.10 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Marek Vasut , Fabio Estevam , Wolfgang Denk , Detlev Zundel , Shawn Guo , Dong Aisheng , Stefano Babic X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Signed-off-by: Marek Vasut Cc: Detlev Zundel CC: Dong Aisheng CC: Fabio Estevam Cc: Linux ARM kernel CC: Shawn Guo Cc: Stefano Babic Cc: Wolfgang Denk --- arch/arm/boot/dts/imx28.dtsi | 18 ++++++++++++++++++ arch/arm/mach-mxs/Kconfig | 1 + 2 files changed, 19 insertions(+) diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index 5053019..a40e30d 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -167,6 +167,22 @@ fsl,pull-up = <0>; }; + flexcan0_pins_a: flexcan0@0 { + reg = <0>; + fsl,pinmux-ids = <0x0161 0x0162>; + fsl,drive-strength = <2>; + fsl,voltage = <1>; + fsl,pull-up = <0>; + }; + + flexcan1_pins_a: flexcan1@0 { + reg = <0>; + fsl,pinmux-ids = <0x0121 0x0122>; + fsl,drive-strength = <2>; + fsl,voltage = <1>; + fsl,pull-up = <0>; + }; + gpmi_pins_a: gpmi-nand@0 { reg = <0>; fsl,pinmux-ids = <0x0000 0x0010 0x0020 @@ -295,12 +311,14 @@ }; can0: can@80032000 { + compatible = "fsl,p1010-flexcan"; reg = <0x80032000 2000>; interrupts = <8>; status = "disabled"; }; can1: can@80034000 { + compatible = "fsl,p1010-flexcan"; reg = <0x80034000 2000>; interrupts = <9>; status = "disabled"; diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig index 91cf062..5451c07 100644 --- a/arch/arm/mach-mxs/Kconfig +++ b/arch/arm/mach-mxs/Kconfig @@ -18,6 +18,7 @@ config SOC_IMX28 select CPU_ARM926T select HAVE_PWM select PINCTRL_IMX28 + select HAVE_CAN_FLEXCAN comment "MXS platforms:"