From patchwork Fri Jun 11 11:46:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Kleine-Budde X-Patchwork-Id: 55310 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C4F9F1007D2 for ; Fri, 11 Jun 2010 21:46:32 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760142Ab0FKLq2 (ORCPT ); Fri, 11 Jun 2010 07:46:28 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:51492 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757840Ab0FKLq1 (ORCPT ); Fri, 11 Jun 2010 07:46:27 -0400 Received: from gallifrey.ext.pengutronix.de ([2001:6f8:1178:4:5054:ff:fe8d:eefb] helo=hardanger.do.blackshift.org) by metis.ext.pengutronix.de with esmtp (Exim 4.71) (envelope-from ) id 1ON2gq-0006Hi-0h; Fri, 11 Jun 2010 13:46:24 +0200 From: Marc Kleine-Budde To: socketcan-core@lists.berlios.de Cc: netdev@vger.kernel.org, Wolfgang Grandegger , Juergen Beisert , Marc Kleine-Budde Subject: [PATCH] Phytec PCM027: register CAN resources Date: Fri, 11 Jun 2010 13:46:16 +0200 Message-Id: <1276256776-17068-1-git-send-email-mkl@pengutronix.de> X-Mailer: git-send-email 1.7.1 X-SA-Exim-Connect-IP: 2001:6f8:1178:4:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Juergen Beisert applies to current net-next-2.6 (which includes Wolfgang's patche "can: sja1000 platform data fixes") cheers, Marc From 66af2a1778a468610e25403336cc27650fddef2a Mon Sep 17 00:00:00 2001 From: Juergen Beisert Date: Fri, 11 Jun 2010 13:27:03 +0200 Subject: [PATCH] Phytec PCM027: register CAN resources This patch adds resources for the SJA1000 platform device. Signed-off-by: Juergen Beisert Signed-off-by: Marc Kleine-Budde --- arch/arm/mach-pxa/include/mach/pcm027.h | 2 +- arch/arm/mach-pxa/pcm027.c | 40 ++++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-pxa/include/mach/pcm027.h b/arch/arm/mach-pxa/include/mach/pcm027.h index 0408326..b65fcc4 100644 --- a/arch/arm/mach-pxa/include/mach/pcm027.h +++ b/arch/arm/mach-pxa/include/mach/pcm027.h @@ -49,7 +49,7 @@ /* CAN controller SJA1000 (unsupported yet) */ #define PCM027_CAN_IRQ_GPIO 114 #define PCM027_CAN_IRQ IRQ_GPIO(PCM027_CAN_IRQ_GPIO) -#define PCM027_CAN_IRQ_EDGE IRQ_TYPE_EDGE_FALLING +#define PCM027_CAN_IRQ_EDGE IORESOURCE_IRQ_LOWEDGE #define PCM027_CAN_PHYS 0x22000000 #define PCM027_CAN_SIZE 0x100 diff --git a/arch/arm/mach-pxa/pcm027.c b/arch/arm/mach-pxa/pcm027.c index 2190af0..2ef7686 100644 --- a/arch/arm/mach-pxa/pcm027.c +++ b/arch/arm/mach-pxa/pcm027.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -204,13 +205,50 @@ static struct platform_device pcm027_led_dev = { #endif /* CONFIG_LEDS_GPIO */ /* + * SJA1000 CAN controller + */ +#if defined(CONFIG_CAN_SJA1000_PLATFORM) || defined(CONFIG_CAN_SJA1000_PLATFORM_MODULE) +static struct resource pcm027_sja1000_resources[] = { + [0] = { + .start = PCM027_CAN_PHYS, + .end = PCM027_CAN_PHYS + PCM027_CAN_SIZE - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = PCM027_CAN_IRQ, + .end = PCM027_CAN_IRQ, + .flags = IORESOURCE_IRQ | PCM027_CAN_IRQ_EDGE, + }, +}; + +static struct sja1000_platform_data pcm027_sja1000_platform_data = { + .osc_freq = 16000000, + .ocr = OCR_TX1_PULLDOWN | OCR_TX0_PUSHPULL, + .cdr = CDR_CBP, +}; + +static struct platform_device pcm027_sja1000_device = { + .name = "sja1000_platform", + .dev = { + .platform_data = &pcm027_sja1000_platform_data, + }, + .num_resources = ARRAY_SIZE(pcm027_sja1000_resources), + .resource = pcm027_sja1000_resources, +}; +#endif /* CONFIG_CAN_SJA1000_PLATFORM || CONFIG_CAN_SJA1000_PLATFORM_MODULE */ + + +/* * declare the available device resources on this board */ static struct platform_device *devices[] __initdata = { &smc91x_device, &pcm027_flash, #ifdef CONFIG_LEDS_GPIO - &pcm027_led_dev + &pcm027_led_dev, +#endif +#if defined(CONFIG_CAN_SJA1000_PLATFORM) || defined(CONFIG_CAN_SJA1000_PLATFORM_MODULE) + &pcm027_sja1000_device, #endif };