diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-04-29 18:52:35 -0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-07-26 09:05:30 -0400 |
| commit | da92e42b11074ec5da8e75fbabcee60c4a50de90 (patch) | |
| tree | c0e713f65d24db8cf553e8de1e1d8bf0202d7f7c | |
| parent | 61c68502321d94a421f9a2a32f6789ecb27f382d (diff) | |
pcm043: register flexcan device
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-mx3/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mx3/mach-pcm043.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig index e063657e1bf4..03563eb997c0 100644 --- a/arch/arm/mach-mx3/Kconfig +++ b/arch/arm/mach-mx3/Kconfig | |||
| @@ -119,6 +119,7 @@ config MACH_PCM043 | |||
| 119 | select IMX_HAVE_PLATFORM_IMX_I2C | 119 | select IMX_HAVE_PLATFORM_IMX_I2C |
| 120 | select IMX_HAVE_PLATFORM_IMX_UART | 120 | select IMX_HAVE_PLATFORM_IMX_UART |
| 121 | select IMX_HAVE_PLATFORM_MXC_NAND | 121 | select IMX_HAVE_PLATFORM_MXC_NAND |
| 122 | select IMX_HAVE_PLATFORM_FLEXCAN | ||
| 122 | select MXC_ULPI if USB_ULPI | 123 | select MXC_ULPI if USB_ULPI |
| 123 | help | 124 | help |
| 124 | Include support for Phytec pcm043 platform. This includes | 125 | Include support for Phytec pcm043 platform. This includes |
diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c index b92f624c755e..47f5311b301a 100644 --- a/arch/arm/mach-mx3/mach-pcm043.c +++ b/arch/arm/mach-mx3/mach-pcm043.c | |||
| @@ -214,6 +214,9 @@ static struct pad_desc pcm043_pads[] = { | |||
| 214 | MX35_PAD_STXD4__AUDMUX_AUD4_TXD, | 214 | MX35_PAD_STXD4__AUDMUX_AUD4_TXD, |
| 215 | MX35_PAD_SRXD4__AUDMUX_AUD4_RXD, | 215 | MX35_PAD_SRXD4__AUDMUX_AUD4_RXD, |
| 216 | MX35_PAD_SCK4__AUDMUX_AUD4_TXC, | 216 | MX35_PAD_SCK4__AUDMUX_AUD4_TXC, |
| 217 | /* CAN2 */ | ||
| 218 | MX35_PAD_TX5_RX0__CAN2_TXCAN, | ||
| 219 | MX35_PAD_TX4_RX1__CAN2_RXCAN, | ||
| 217 | }; | 220 | }; |
| 218 | 221 | ||
| 219 | #define AC97_GPIO_TXFS (1 * 32 + 31) | 222 | #define AC97_GPIO_TXFS (1 * 32 + 31) |
| @@ -385,6 +388,7 @@ static void __init mxc_board_init(void) | |||
| 385 | if (!otg_mode_host) | 388 | if (!otg_mode_host) |
| 386 | mxc_register_device(&mxc_otg_udc_device, &otg_device_pdata); | 389 | mxc_register_device(&mxc_otg_udc_device, &otg_device_pdata); |
| 387 | 390 | ||
| 391 | imx35_add_flexcan1(NULL); | ||
| 388 | } | 392 | } |
| 389 | 393 | ||
| 390 | static void __init pcm043_timer_init(void) | 394 | static void __init pcm043_timer_init(void) |
