From 395ab3177060bef1d6eb255436c42ca18ece502e Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Fri, 30 Apr 2010 00:52:35 +0200 Subject: [PATCH] --- yaml --- r: 201677 b: refs/heads/master c: da92e42b11074ec5da8e75fbabcee60c4a50de90 h: refs/heads/master i: 201675: da86cf9f904ddb2d767133fbbd48cf8256d52504 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx3/Kconfig | 1 + trunk/arch/arm/mach-mx3/mach-pcm043.c | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 252a5f798645..5a4e3a978c93 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61c68502321d94a421f9a2a32f6789ecb27f382d +refs/heads/master: da92e42b11074ec5da8e75fbabcee60c4a50de90 diff --git a/trunk/arch/arm/mach-mx3/Kconfig b/trunk/arch/arm/mach-mx3/Kconfig index e063657e1bf4..03563eb997c0 100644 --- a/trunk/arch/arm/mach-mx3/Kconfig +++ b/trunk/arch/arm/mach-mx3/Kconfig @@ -119,6 +119,7 @@ config MACH_PCM043 select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_MXC_NAND + select IMX_HAVE_PLATFORM_FLEXCAN select MXC_ULPI if USB_ULPI help Include support for Phytec pcm043 platform. This includes diff --git a/trunk/arch/arm/mach-mx3/mach-pcm043.c b/trunk/arch/arm/mach-mx3/mach-pcm043.c index b92f624c755e..47f5311b301a 100644 --- a/trunk/arch/arm/mach-mx3/mach-pcm043.c +++ b/trunk/arch/arm/mach-mx3/mach-pcm043.c @@ -214,6 +214,9 @@ static struct pad_desc pcm043_pads[] = { MX35_PAD_STXD4__AUDMUX_AUD4_TXD, MX35_PAD_SRXD4__AUDMUX_AUD4_RXD, MX35_PAD_SCK4__AUDMUX_AUD4_TXC, + /* CAN2 */ + MX35_PAD_TX5_RX0__CAN2_TXCAN, + MX35_PAD_TX4_RX1__CAN2_RXCAN, }; #define AC97_GPIO_TXFS (1 * 32 + 31) @@ -385,6 +388,7 @@ static void __init mxc_board_init(void) if (!otg_mode_host) mxc_register_device(&mxc_otg_udc_device, &otg_device_pdata); + imx35_add_flexcan1(NULL); } static void __init pcm043_timer_init(void)