diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-07-22 11:45:34 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-07-26 15:05:29 +0200 |
| commit | 61c68502321d94a421f9a2a32f6789ecb27f382d (patch) | |
| tree | f11a63bf01c5438d5c44deb14e45f38d85aec243 /arch/arm/plat-mxc/include/mach/devices-common.h | |
| parent | a7d945a469ee566bde26217362c95f29acfbd14a (diff) | |
| download | kernel_samsung_smdk4412-61c68502321d94a421f9a2a32f6789ecb27f382d.zip kernel_samsung_smdk4412-61c68502321d94a421f9a2a32f6789ecb27f382d.tar.gz kernel_samsung_smdk4412-61c68502321d94a421f9a2a32f6789ecb27f382d.tar.bz2 | |
imx: dynamically register flexcan devices for mx25 and mx35
In order to make this patch compile, even if the flexcan driver with
it's header defining the platform data isn't merged yet, two ifdefs have
been added. They effect that the "imx_add_flexcan" function results in a
no-op function if the driver hasn't been activated.
These ifdefs can be removed after the flexcan driver has been merged.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/devices-common.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/devices-common.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h index 05c8d3f..c5f68c5 100644 --- 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, |