Commit 22cbba1b authored by Marc Kleine-Budde's avatar Marc Kleine-Budde Committed by Sascha Hauer
Browse files

ARM: mxs: dynamically register flexcan devices for mx28 



Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 6ea038a7

arch/arm/mach-mxs/devices-mx28.h

+6 −0
Original line number Diff line number Diff line
@@ -26,3 +26,9 @@ extern const struct mxs_auart_data mx28_auart_data[] __initconst; 
extern const struct mxs_fec_data mx28_fec_data[] __initconst;

#define mx28_add_fec(id, pdata) \

	mxs_add_fec(&mx28_fec_data[id], pdata)



extern const struct mxs_flexcan_data mx28_flexcan_data[] __initconst;

#define mx28_add_flexcan(id, pdata)	\

	mxs_add_flexcan(&mx28_flexcan_data[id], pdata)

#define mx28_add_flexcan0(pdata)	mx28_add_flexcan(0, pdata)

#define mx28_add_flexcan1(pdata)	mx28_add_flexcan(1, pdata)

arch/arm/mach-mxs/devices/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -7,3 +7,7 @@ config MXS_HAVE_PLATFORM_AUART 


config MXS_HAVE_PLATFORM_FEC

	bool



config MXS_HAVE_PLATFORM_FLEXCAN

	select HAVE_CAN_FLEXCAN if CAN

	bool

arch/arm/mach-mxs/devices/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_MXS_HAVE_AMBA_DUART) += amba-duart.o

obj-$(CONFIG_MXS_HAVE_PLATFORM_AUART) += platform-auart.o

obj-$(CONFIG_MXS_HAVE_PLATFORM_FEC) += platform-fec.o

obj-$(CONFIG_MXS_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o

arch/arm/mach-mxs/devices/platform-flexcan.c

0 → 100644
+51 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010, 2011 Pengutronix,

 *                          Marc Kleine-Budde <kernel@pengutronix.de>

 *

 * This program is free software; you can redistribute it and/or modify it under

 * the terms of the GNU General Public License version 2 as published by the

 * Free Software Foundation.

 */

#include <asm/sizes.h>

#include <mach/mx28.h>

#include <mach/devices-common.h>



#define mxs_flexcan_data_entry_single(soc, _id, _hwid, _size)		\

	{								\

		.id = _id,						\

		.iobase = soc ## _CAN ## _hwid ## _BASE_ADDR,		\

		.iosize = _size,					\

		.irq = soc ## _INT_CAN ## _hwid,			\

	}



#define mxs_flexcan_data_entry(soc, _id, _hwid, _size)			\

	[_id] = mxs_flexcan_data_entry_single(soc, _id, _hwid, _size)



#ifdef CONFIG_SOC_IMX28

const struct mxs_flexcan_data mx28_flexcan_data[] __initconst = {

#define mx28_flexcan_data_entry(_id, _hwid)				\

	mxs_flexcan_data_entry_single(MX28, _id, _hwid, SZ_8K)

	mx28_flexcan_data_entry(0, 0),

	mx28_flexcan_data_entry(1, 1),

};

#endif /* ifdef CONFIG_SOC_IMX28 */



struct platform_device *__init mxs_add_flexcan(

		const struct mxs_flexcan_data *data,

		const struct flexcan_platform_data *pdata)

{

	struct resource res[] = {

		{

			.start = data->iobase,

			.end = data->iobase + data->iosize - 1,

			.flags = IORESOURCE_MEM,

		}, {

			.start = data->irq,

			.end = data->irq,

			.flags = IORESOURCE_IRQ,

		},

	};



	return mxs_add_platform_device("flexcan", data->id,

			res, ARRAY_SIZE(res), pdata, sizeof(*pdata));

}

arch/arm/mach-mxs/include/mach/devices-common.h

+12 −0
Original line number Diff line number Diff line
@@ -51,3 +51,15 @@ struct mxs_fec_data { 
struct platform_device *__init mxs_add_fec(

		const struct mxs_fec_data *data,

		const struct fec_platform_data *pdata);



/* flexcan */

#include <linux/can/platform/flexcan.h>

struct mxs_flexcan_data {

	int id;

	resource_size_t iobase;

	resource_size_t iosize;

	resource_size_t irq;

};

struct platform_device *__init mxs_add_flexcan(

		const struct mxs_flexcan_data *data,

		const struct flexcan_platform_data *pdata);