* [PATCH 0/2] ARM: mxs: add flexcan support
@ 2011-02-02 12:50 Marc Kleine-Budde
2011-02-02 12:50 ` [PATCH 1/2] ARM: mxs: adjust flexcan clock definition Marc Kleine-Budde
2011-02-02 12:50 ` [PATCH 2/2] ARM: mxs: dynamically register flexcan devices for mx28 Marc Kleine-Budde
0 siblings, 2 replies; 3+ messages in thread
From: Marc Kleine-Budde @ 2011-02-02 12:50 UTC (permalink / raw)
To: linux-arm-kernel
Hello,
this patch series adds support for freescale's flexcan core to the mx28
architecture. The flexcan can driver supports mx28 without any modifications.
This series has been successfully tested on a Ka-Ro tx28 board.
It's based on Sascha's imx-for-2.6.39 tree and can be pulled from:
The following changes since commit df42c8a720ff2e0d52d187bb1120339e79f58604:
ARM: mx5/board-mx53_evk.c: Make UART1 functional (2011-02-01 10:26:12 +0100)
are available in the git repository at:
git://git.pengutronix.de/git/mkl/linux-2.6.git imx-for-2.6.39/msx-flexcan
Marc Kleine-Budde (2):
ARM: mxs: adjust flexcan clock definition
ARM: mxs: dynamically register flexcan devices for mx28
arch/arm/mach-mxs/clock-mx28.c | 4 +-
arch/arm/mach-mxs/devices-mx28.h | 6 +++
arch/arm/mach-mxs/devices/Kconfig | 4 ++
arch/arm/mach-mxs/devices/Makefile | 1 +
arch/arm/mach-mxs/devices/platform-flexcan.c | 51 +++++++++++++++++++++++
arch/arm/mach-mxs/include/mach/devices-common.h | 12 +++++
6 files changed, 76 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/mach-mxs/devices/platform-flexcan.c
regards, Marc
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] ARM: mxs: adjust flexcan clock definition
2011-02-02 12:50 [PATCH 0/2] ARM: mxs: add flexcan support Marc Kleine-Budde
@ 2011-02-02 12:50 ` Marc Kleine-Budde
2011-02-02 12:50 ` [PATCH 2/2] ARM: mxs: dynamically register flexcan devices for mx28 Marc Kleine-Budde
1 sibling, 0 replies; 3+ messages in thread
From: Marc Kleine-Budde @ 2011-02-02 12:50 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
arch/arm/mach-mxs/clock-mx28.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c
index 2f1a990..c9d7951 100644
--- a/arch/arm/mach-mxs/clock-mx28.c
+++ b/arch/arm/mach-mxs/clock-mx28.c
@@ -619,8 +619,8 @@ static struct clk_lookup lookups[] = {
_REGISTER_CLOCK("pll2", NULL, pll2_clk)
_REGISTER_CLOCK(NULL, "hclk", hbus_clk)
_REGISTER_CLOCK(NULL, "xclk", xbus_clk)
- _REGISTER_CLOCK(NULL, "can0", can0_clk)
- _REGISTER_CLOCK(NULL, "can1", can1_clk)
+ _REGISTER_CLOCK("flexcan.0", NULL, can0_clk)
+ _REGISTER_CLOCK("flexcan.1", NULL, can1_clk)
_REGISTER_CLOCK(NULL, "usb0", usb0_clk)
_REGISTER_CLOCK(NULL, "usb1", usb1_clk)
_REGISTER_CLOCK(NULL, "pwm", pwm_clk)
--
1.7.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] ARM: mxs: dynamically register flexcan devices for mx28
2011-02-02 12:50 [PATCH 0/2] ARM: mxs: add flexcan support Marc Kleine-Budde
2011-02-02 12:50 ` [PATCH 1/2] ARM: mxs: adjust flexcan clock definition Marc Kleine-Budde
@ 2011-02-02 12:50 ` Marc Kleine-Budde
1 sibling, 0 replies; 3+ messages in thread
From: Marc Kleine-Budde @ 2011-02-02 12:50 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
arch/arm/mach-mxs/devices-mx28.h | 6 +++
arch/arm/mach-mxs/devices/Kconfig | 4 ++
arch/arm/mach-mxs/devices/Makefile | 1 +
arch/arm/mach-mxs/devices/platform-flexcan.c | 51 +++++++++++++++++++++++
arch/arm/mach-mxs/include/mach/devices-common.h | 12 +++++
5 files changed, 74 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-mxs/devices/platform-flexcan.c
diff --git a/arch/arm/mach-mxs/devices-mx28.h b/arch/arm/mach-mxs/devices-mx28.h
index 1ab7bf0..3b18304 100644
--- a/arch/arm/mach-mxs/devices-mx28.h
+++ b/arch/arm/mach-mxs/devices-mx28.h
@@ -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)
diff --git a/arch/arm/mach-mxs/devices/Kconfig b/arch/arm/mach-mxs/devices/Kconfig
index 3001b75..6c65b67 100644
--- a/arch/arm/mach-mxs/devices/Kconfig
+++ b/arch/arm/mach-mxs/devices/Kconfig
@@ -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
diff --git a/arch/arm/mach-mxs/devices/Makefile b/arch/arm/mach-mxs/devices/Makefile
index c814d05..a8dc8d5 100644
--- a/arch/arm/mach-mxs/devices/Makefile
+++ b/arch/arm/mach-mxs/devices/Makefile
@@ -1,3 +1,4 @@
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
diff --git a/arch/arm/mach-mxs/devices/platform-flexcan.c b/arch/arm/mach-mxs/devices/platform-flexcan.c
new file mode 100644
index 0000000..43a6b4b
--- /dev/null
+++ b/arch/arm/mach-mxs/devices/platform-flexcan.c
@@ -0,0 +1,51 @@
+/*
+ * 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));
+}
diff --git a/arch/arm/mach-mxs/include/mach/devices-common.h b/arch/arm/mach-mxs/include/mach/devices-common.h
index bed4002..e7aefb4 100644
--- a/arch/arm/mach-mxs/include/mach/devices-common.h
+++ b/arch/arm/mach-mxs/include/mach/devices-common.h
@@ -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);
--
1.7.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-02 12:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-02 12:50 [PATCH 0/2] ARM: mxs: add flexcan support Marc Kleine-Budde
2011-02-02 12:50 ` [PATCH 1/2] ARM: mxs: adjust flexcan clock definition Marc Kleine-Budde
2011-02-02 12:50 ` [PATCH 2/2] ARM: mxs: dynamically register flexcan devices for mx28 Marc Kleine-Budde
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).