summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-mx25_3ds.c
diff options
context:
space:
mode:
authorMarc Kleine-Budde2013-06-11 04:12:56 +0200
committerMarc Kleine-Budde2013-06-27 15:15:08 +0200
commit30caa4b763bf5973800633de55bae586ab443f78 (patch)
treec109c7d1394a18d9b72fafe3aff8f6d160612ee9 /arch/arm/mach-imx/mach-mx25_3ds.c
parentfec: Add support for reading RMON registers (diff)
downloadkernel-qcow2-linux-30caa4b763bf5973800633de55bae586ab443f78.tar.gz
kernel-qcow2-linux-30caa4b763bf5973800633de55bae586ab443f78.tar.xz
kernel-qcow2-linux-30caa4b763bf5973800633de55bae586ab443f78.zip
ARM: imx: prepare for removal of flexcan_platform_data
As there are no imx in-tree users of flexcan_platform_data, this patch removes the possibility to register a flexcan device with platform data. The functionality to swith on/off CAN transceivers is added to DT via regulators in a later patch. Compile time tested with imx_v4_v5_defconfig and imx_v6_v7_defconfig. Acked-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-mx25_3ds.c')
-rw-r--r--arch/arm/mach-imx/mach-mx25_3ds.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx25_3ds.c b/arch/arm/mach-imx/mach-mx25_3ds.c
index 8bcda688a006..13490c203050 100644
--- a/arch/arm/mach-imx/mach-mx25_3ds.c
+++ b/arch/arm/mach-imx/mach-mx25_3ds.c
@@ -249,7 +249,7 @@ static void __init mx25pdk_init(void)
imx25_add_imx_i2c0(&mx25_3ds_i2c0_data);
gpio_request_one(MX25PDK_CAN_PWDN, GPIOF_OUT_INIT_LOW, "can-pwdn");
- imx25_add_flexcan0(NULL);
+ imx25_add_flexcan0();
}
static void __init mx25pdk_timer_init(void)