imx: dynamically register flexcan devices for mx25 and mx35

[deliverable/linux.git] / arch / arm / plat-mxc / include / mach / devices-common.h

diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h
index 05c8d3f0a08ffba821ac9bdc6cae8fa9c78214e2..c5f68c587309e2f37949f61c540fcf7826587f70 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/devices-common.h
+++ b/arch/arm/plat-mxc/include/mach/devices-common.h
@@ -14,6 +14,24 @@ struct platform_device *imx_add_platform_device(const char *name, int id,
                const struct resource *res, unsigned int num_resources,
                const void *data, size_t size_data);
 
+#if defined (CONFIG_CAN_FLEXCAN) || defined (CONFIG_CAN_FLEXCAN_MODULE)
+#include <linux/can/platform/flexcan.h>
+struct platform_device *__init imx_add_flexcan(int id,
+               resource_size_t iobase, resource_size_t iosize,
+               resource_size_t irq,
+               const struct flexcan_platform_data *pdata);
+#else
+/* the ifdef can be removed once the flexcan driver has been merged */
+struct flexcan_platform_data;
+static inline struct platform_device *__init imx_add_flexcan(int id,
+               resource_size_t iobase, resource_size_t iosize,
+               resource_size_t irq,
+               const struct flexcan_platform_data *pdata)
+{
+       return NULL;
+}
+#endif
+
 #include <mach/i2c.h>
 struct platform_device *__init imx_add_imx_i2c(int id,
                resource_size_t iobase, resource_size_t iosize, int irq,