From patchwork Fri Sep 9 20:00:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rogerio Pimentel X-Patchwork-Id: 114124 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 DF89FB6F99 for ; Sat, 10 Sep 2011 06:00:35 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1R27FT-0001lr-LD; Fri, 09 Sep 2011 20:00:27 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1R27FT-0007ti-9B; Fri, 09 Sep 2011 20:00:27 +0000 Received: from va3ehsobe001.messaging.microsoft.com ([216.32.180.11] helo=VA3EHSOBE001.bigfish.com) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1R27FQ-0007tO-UO for linux-arm-kernel@lists.infradead.org; Fri, 09 Sep 2011 20:00:25 +0000 Received: from mail165-va3-R.bigfish.com (10.7.14.243) by VA3EHSOBE001.bigfish.com (10.7.40.21) with Microsoft SMTP Server id 14.1.225.22; Fri, 9 Sep 2011 20:00:22 +0000 Received: from mail165-va3 (localhost.localdomain [127.0.0.1]) by mail165-va3-R.bigfish.com (Postfix) with ESMTP id 394039282FF; Fri, 9 Sep 2011 20:00:22 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839h61h) X-Spam-TCS-SCL: 0:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail165-va3 (localhost.localdomain [127.0.0.1]) by mail165-va3 (MessageSwitch) id 1315598406396470_22442; Fri, 9 Sep 2011 20:00:06 +0000 (UTC) Received: from VA3EHSMHS025.bigfish.com (unknown [10.7.14.240]) by mail165-va3.bigfish.com (Postfix) with ESMTP id 1849BD9004D; Fri, 9 Sep 2011 20:00:06 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS025.bigfish.com (10.7.99.35) with Microsoft SMTP Server (TLS) id 14.1.225.22; Fri, 9 Sep 2011 19:59:57 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.323.7; Fri, 9 Sep 2011 14:59:53 -0500 Received: from b19259.am.freescale.net ([10.29.240.183]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id p89Jxh9X005051; Fri, 9 Sep 2011 14:59:51 -0500 (CDT) From: Rogerio Pimentel To: Subject: [PATCH v2 3/4] ARM: mx53: Add resources for flexcan Date: Fri, 9 Sep 2011 17:00:07 -0300 Message-ID: <1315598408-29563-3-git-send-email-rogerio.pimentel@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1315598408-29563-1-git-send-email-rogerio.pimentel@freescale.com> References: <1315598408-29563-1-git-send-email-rogerio.pimentel@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110909_160025_070444_9CE5AFEE X-CRM114-Status: GOOD ( 13.29 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [216.32.180.11 listed in list.dnswl.org] Cc: Rogerio Pimentel , kernel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Adding resources for flexcan on i.MX53 Signed-off-by: Rogerio Pimentel --- Changes since v1: Changed the way imx_flexcan_data_entry is called arch/arm/mach-mx5/devices-imx53.h | 6 ++++++ arch/arm/plat-mxc/devices/platform-flexcan.c | 7 +++++++ arch/arm/plat-mxc/include/mach/mx53.h | 2 ++ 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-mx5/devices-imx53.h b/arch/arm/mach-mx5/devices-imx53.h index 7ca5d0c..8c00464 100644 --- a/arch/arm/mach-mx5/devices-imx53.h +++ b/arch/arm/mach-mx5/devices-imx53.h @@ -44,3 +44,9 @@ extern const struct imx_imx_keypad_data imx53_imx_keypad_data; extern const struct imx_pata_imx_data imx53_pata_imx_data; #define imx53_add_pata_imx() \ imx_add_pata_imx(&imx53_pata_imx_data) + +extern const struct imx_flexcan_data imx53_flexcan_data[]; +#define imx53_add_flexcan(id, pdata) \ + imx_add_flexcan(&imx53_flexcan_data[id], pdata) +#define imx53_add_flexcan0(pdata) imx53_add_flexcan(0, pdata) +#define imx53_add_flexcan1(pdata) imx53_add_flexcan(1, pdata) diff --git a/arch/arm/plat-mxc/devices/platform-flexcan.c b/arch/arm/plat-mxc/devices/platform-flexcan.c index 4e8497a..1c9612f 100644 --- a/arch/arm/plat-mxc/devices/platform-flexcan.c +++ b/arch/arm/plat-mxc/devices/platform-flexcan.c @@ -37,6 +37,13 @@ const struct imx_flexcan_data imx35_flexcan_data[] __initconst = { }; #endif /* ifdef CONFIG_SOC_IMX35 */ +#ifdef CONFIG_SOC_IMX53 +const struct imx_flexcan_data imx53_flexcan_data[] __initconst = { + imx_flexcan_data_entry(MX53, 0, 1, SZ_16K), + imx_flexcan_data_entry(MX53, 1, 2, SZ_16K), +}; +#endif /* ifdef CONFIG_SOC_IMX53 */ + struct platform_device *__init imx_add_flexcan( const struct imx_flexcan_data *data, const struct flexcan_platform_data *pdata) diff --git a/arch/arm/plat-mxc/include/mach/mx53.h b/arch/arm/plat-mxc/include/mach/mx53.h index 5e3c323..e96ed9f 100644 --- a/arch/arm/plat-mxc/include/mach/mx53.h +++ b/arch/arm/plat-mxc/include/mach/mx53.h @@ -90,6 +90,8 @@ #define MX53_PWM2_BASE_ADDR (MX53_AIPS1_BASE_ADDR + 0x000B8000) #define MX53_UART1_BASE_ADDR (MX53_AIPS1_BASE_ADDR + 0x000BC000) #define MX53_UART2_BASE_ADDR (MX53_AIPS1_BASE_ADDR + 0x000C0000) +#define MX53_CAN1_BASE_ADDR (MX53_AIPS1_BASE_ADDR + 0x000C8000) +#define MX53_CAN2_BASE_ADDR (MX53_AIPS1_BASE_ADDR + 0x000CC000) #define MX53_SRC_BASE_ADDR (MX53_AIPS1_BASE_ADDR + 0x000D0000) #define MX53_CCM_BASE_ADDR (MX53_AIPS1_BASE_ADDR + 0x000D4000) #define MX53_GPC_BASE_ADDR (MX53_AIPS1_BASE_ADDR + 0x000D8000)