* [PATCH v3 1/4] ARM: mx53: Change pad configs for flexcan pins
@ 2011-09-22 17:30 Rogerio Pimentel
2011-09-22 17:30 ` [PATCH v3 2/4] ARM: mx53: Add clock for flexcan Rogerio Pimentel
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Rogerio Pimentel @ 2011-09-22 17:30 UTC (permalink / raw)
To: linux-arm-kernel
Changing pad configs for flexcan on i.MX53
Signed-off-by: Rogerio Pimentel <rogerio.pimentel@freescale.com>
---
Changes since v2:
Rebased to imx-cleanup, changed the patch subject
arch/arm/plat-mxc/include/mach/iomux-mx53.h | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx53.h b/arch/arm/plat-mxc/include/mach/iomux-mx53.h
index 527f8fe..12b5a5d 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-mx53.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mx53.h
@@ -30,7 +30,8 @@
#define MX53_SDHC_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PKE | PAD_CTL_PUE | \
PAD_CTL_PUS_47K_UP | PAD_CTL_DSE_HIGH | \
PAD_CTL_SRE_FAST)
-
+#define MX53_CAN_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_DSE_HIGH | \
+ PAD_CTL_HYS)
#define MX53_PAD_GPIO_19__KPP_COL_5 IOMUX_PAD(0x348, 0x020, 0, 0x840, 0, NO_PAD_CTRL)
#define MX53_PAD_GPIO_19__GPIO4_5 IOMUX_PAD(0x348, 0x020, 1, __NA_, 0, NO_PAD_CTRL)
@@ -69,14 +70,14 @@
#define MX53_PAD_KEY_ROW1__USBPHY1_RXVALID IOMUX_PAD(0x358, 0x030, 7, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_KEY_COL2__KPP_COL_2 IOMUX_PAD(0x35C, 0x034, 0, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_KEY_COL2__GPIO4_10 IOMUX_PAD(0x35C, 0x034, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX53_PAD_KEY_COL2__CAN1_TXCAN IOMUX_PAD(0x35C, 0x034, 2, __NA_, 0, NO_PAD_CTRL)
+#define MX53_PAD_KEY_COL2__CAN1_TXCAN IOMUX_PAD(0x35C, 0x034, 2, __NA_, 0, MX53_CAN_PAD_CTRL)
#define MX53_PAD_KEY_COL2__FEC_MDIO IOMUX_PAD(0x35C, 0x034, 4, 0x804, 0, NO_PAD_CTRL)
#define MX53_PAD_KEY_COL2__ECSPI1_SS1 IOMUX_PAD(0x35C, 0x034, 5, 0x7AC, 0, NO_PAD_CTRL)
#define MX53_PAD_KEY_COL2__FEC_RDATA_2 IOMUX_PAD(0x35C, 0x034, 6, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_KEY_COL2__USBPHY1_RXACTIVE IOMUX_PAD(0x35C, 0x034, 7, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_KEY_ROW2__KPP_ROW_2 IOMUX_PAD(0x360, 0x038, 0, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_KEY_ROW2__GPIO4_11 IOMUX_PAD(0x360, 0x038, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX53_PAD_KEY_ROW2__CAN1_RXCAN IOMUX_PAD(0x360, 0x038, 2, 0x760, 0, NO_PAD_CTRL)
+#define MX53_PAD_KEY_ROW2__CAN1_RXCAN IOMUX_PAD(0x360, 0x038, 2, 0x760, 0, MX53_CAN_PAD_CTRL)
#define MX53_PAD_KEY_ROW2__FEC_MDC IOMUX_PAD(0x360, 0x038, 4, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_KEY_ROW2__ECSPI1_SS2 IOMUX_PAD(0x360, 0x038, 5, 0x7B0, 0, NO_PAD_CTRL)
#define MX53_PAD_KEY_ROW2__FEC_TDATA_2 IOMUX_PAD(0x360, 0x038, 6, __NA_, 0, NO_PAD_CTRL)
@@ -99,14 +100,14 @@
#define MX53_PAD_KEY_ROW3__USBPHY1_LINESTATE_0 IOMUX_PAD(0x368, 0x040, 7, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_KEY_COL4__KPP_COL_4 IOMUX_PAD(0x36C, 0x044, 0, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_KEY_COL4__GPIO4_14 IOMUX_PAD(0x36C, 0x044, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX53_PAD_KEY_COL4__CAN2_TXCAN IOMUX_PAD(0x36C, 0x044, 2, __NA_, 0, NO_PAD_CTRL)
+#define MX53_PAD_KEY_COL4__CAN2_TXCAN IOMUX_PAD(0x36C, 0x044, 2, __NA_, 0, MX53_CAN_PAD_CTRL)
#define MX53_PAD_KEY_COL4__IPU_SISG_4 IOMUX_PAD(0x36C, 0x044, 3, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_KEY_COL4__UART5_RTS IOMUX_PAD(0x36C, 0x044, 4, 0x894, 0, MX53_UART_PAD_CTRL)
#define MX53_PAD_KEY_COL4__USBOH3_USBOTG_OC IOMUX_PAD(0x36C, 0x044, 5, 0x89C, 0, NO_PAD_CTRL)
#define MX53_PAD_KEY_COL4__USBPHY1_LINESTATE_1 IOMUX_PAD(0x36C, 0x044, 7, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_KEY_ROW4__KPP_ROW_4 IOMUX_PAD(0x370, 0x048, 0, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_KEY_ROW4__GPIO4_15 IOMUX_PAD(0x370, 0x048, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX53_PAD_KEY_ROW4__CAN2_RXCAN IOMUX_PAD(0x370, 0x048, 2, 0x764, 0, NO_PAD_CTRL)
+#define MX53_PAD_KEY_ROW4__CAN2_RXCAN IOMUX_PAD(0x370, 0x048, 2, 0x764, 0, MX53_CAN_PAD_CTRL)
#define MX53_PAD_KEY_ROW4__IPU_SISG_5 IOMUX_PAD(0x370, 0x048, 3, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_KEY_ROW4__UART5_CTS IOMUX_PAD(0x370, 0x048, 4, __NA_, 0, MX53_UART_PAD_CTRL)
#define MX53_PAD_KEY_ROW4__USBOH3_USBOTG_PWR IOMUX_PAD(0x370, 0x048, 5, __NA_, 0, NO_PAD_CTRL)
@@ -891,25 +892,25 @@
#define MX53_PAD_PATA_INTRQ__PATA_INTRQ IOMUX_PAD(0x600, 0x280, 0, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_PATA_INTRQ__GPIO7_2 IOMUX_PAD(0x600, 0x280, 1, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_PATA_INTRQ__UART2_CTS IOMUX_PAD(0x600, 0x280, 3, __NA_, 0, MX53_UART_PAD_CTRL)
-#define MX53_PAD_PATA_INTRQ__CAN1_TXCAN IOMUX_PAD(0x600, 0x280, 4, __NA_, 0, NO_PAD_CTRL)
+#define MX53_PAD_PATA_INTRQ__CAN1_TXCAN IOMUX_PAD(0x600, 0x280, 4, __NA_, 0, MX53_CAN_PAD_CTRL)
#define MX53_PAD_PATA_INTRQ__CCM_CCM_OUT_2 IOMUX_PAD(0x600, 0x280, 5, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_PATA_INTRQ__USBPHY2_DATAOUT_6 IOMUX_PAD(0x600, 0x280, 7, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_PATA_DIOR__PATA_DIOR IOMUX_PAD(0x604, 0x284, 0, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_PATA_DIOR__GPIO7_3 IOMUX_PAD(0x604, 0x284, 1, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_PATA_DIOR__UART2_RTS IOMUX_PAD(0x604, 0x284, 3, 0x87C, 3, MX53_UART_PAD_CTRL)
-#define MX53_PAD_PATA_DIOR__CAN1_RXCAN IOMUX_PAD(0x604, 0x284, 4, 0x760, 1, NO_PAD_CTRL)
+#define MX53_PAD_PATA_DIOR__CAN1_RXCAN IOMUX_PAD(0x604, 0x284, 4, 0x760, 1, MX53_CAN_PAD_CTRL)
#define MX53_PAD_PATA_DIOR__USBPHY2_DATAOUT_7 IOMUX_PAD(0x604, 0x284, 7, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_PATA_RESET_B__PATA_PATA_RESET_B IOMUX_PAD(0x608, 0x288, 0, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_PATA_RESET_B__GPIO7_4 IOMUX_PAD(0x608, 0x288, 1, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_PATA_RESET_B__ESDHC3_CMD IOMUX_PAD(0x608, 0x288, 2, __NA_, 0, MX53_SDHC_PAD_CTRL)
#define MX53_PAD_PATA_RESET_B__UART1_CTS IOMUX_PAD(0x608, 0x288, 3, __NA_, 0, MX53_UART_PAD_CTRL)
-#define MX53_PAD_PATA_RESET_B__CAN2_TXCAN IOMUX_PAD(0x608, 0x288, 4, __NA_, 0, NO_PAD_CTRL)
+#define MX53_PAD_PATA_RESET_B__CAN2_TXCAN IOMUX_PAD(0x608, 0x288, 4, __NA_, 0, MX53_CAN_PAD_CTRL)
#define MX53_PAD_PATA_RESET_B__USBPHY1_DATAOUT_0 IOMUX_PAD(0x608, 0x288, 7, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_PATA_IORDY__PATA_IORDY IOMUX_PAD(0x60C, 0x28C, 0, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_PATA_IORDY__GPIO7_5 IOMUX_PAD(0x60C, 0x28C, 1, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_PATA_IORDY__ESDHC3_CLK IOMUX_PAD(0x60C, 0x28C, 2, __NA_, 0, MX53_SDHC_PAD_CTRL)
#define MX53_PAD_PATA_IORDY__UART1_RTS IOMUX_PAD(0x60C, 0x28C, 3, 0x874, 3, MX53_UART_PAD_CTRL)
-#define MX53_PAD_PATA_IORDY__CAN2_RXCAN IOMUX_PAD(0x60C, 0x28C, 4, 0x764, 1, NO_PAD_CTRL)
+#define MX53_PAD_PATA_IORDY__CAN2_RXCAN IOMUX_PAD(0x60C, 0x28C, 4, 0x764, 1, MX53_CAN_PAD_CTRL)
#define MX53_PAD_PATA_IORDY__USBPHY1_DATAOUT_1 IOMUX_PAD(0x60C, 0x28C, 7, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_PATA_DA_0__PATA_DA_0 IOMUX_PAD(0x610, 0x290, 0, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_PATA_DA_0__GPIO7_6 IOMUX_PAD(0x610, 0x290, 1, __NA_, 0, NO_PAD_CTRL)
@@ -1179,7 +1180,7 @@
#define MX53_PAD_GPIO_7__ESAI1_TX4_RX1 IOMUX_PAD(0x6C4, 0x334, 0, 0x7F4, 1, NO_PAD_CTRL)
#define MX53_PAD_GPIO_7__GPIO1_7 IOMUX_PAD(0x6C4, 0x334, 1, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_GPIO_7__EPIT1_EPITO IOMUX_PAD(0x6C4, 0x334, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX53_PAD_GPIO_7__CAN1_TXCAN IOMUX_PAD(0x6C4, 0x334, 3, __NA_, 0, NO_PAD_CTRL)
+#define MX53_PAD_GPIO_7__CAN1_TXCAN IOMUX_PAD(0x6C4, 0x334, 3, __NA_, 0, MX53_CAN_PAD_CTRL)
#define MX53_PAD_GPIO_7__UART2_TXD_MUX IOMUX_PAD(0x6C4, 0x334, 4, __NA_, 0, MX53_UART_PAD_CTRL)
#define MX53_PAD_GPIO_7__FIRI_RXD IOMUX_PAD(0x6C4, 0x334, 5, 0x80C, 1, NO_PAD_CTRL)
#define MX53_PAD_GPIO_7__SPDIF_PLOCK IOMUX_PAD(0x6C4, 0x334, 6, __NA_, 0, NO_PAD_CTRL)
@@ -1187,7 +1188,7 @@
#define MX53_PAD_GPIO_8__ESAI1_TX5_RX0 IOMUX_PAD(0x6C8, 0x338, 0, 0x7F8, 1, NO_PAD_CTRL)
#define MX53_PAD_GPIO_8__GPIO1_8 IOMUX_PAD(0x6C8, 0x338, 1, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_GPIO_8__EPIT2_EPITO IOMUX_PAD(0x6C8, 0x338, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX53_PAD_GPIO_8__CAN1_RXCAN IOMUX_PAD(0x6C8, 0x338, 3, 0x760, 3, NO_PAD_CTRL)
+#define MX53_PAD_GPIO_8__CAN1_RXCAN IOMUX_PAD(0x6C8, 0x338, 3, 0x760, 3, MX53_CAN_PAD_CTRL)
#define MX53_PAD_GPIO_8__UART2_RXD_MUX IOMUX_PAD(0x6C8, 0x338, 4, 0x880, 5, MX53_UART_PAD_CTRL)
#define MX53_PAD_GPIO_8__FIRI_TXD IOMUX_PAD(0x6C8, 0x338, 5, __NA_, 0, NO_PAD_CTRL)
#define MX53_PAD_GPIO_8__SPDIF_SRCLK IOMUX_PAD(0x6C8, 0x338, 6, __NA_, 0, NO_PAD_CTRL)
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3 2/4] ARM: mx53: Add clock for flexcan
2011-09-22 17:30 [PATCH v3 1/4] ARM: mx53: Change pad configs for flexcan pins Rogerio Pimentel
@ 2011-09-22 17:30 ` Rogerio Pimentel
2011-09-22 17:30 ` [PATCH v3 3/4] ARM: mx53: Add resources " Rogerio Pimentel
2011-09-22 17:30 ` [PATCH v3 4/4] ARM: mx53_ard: Add flexcan support Rogerio Pimentel
2 siblings, 0 replies; 5+ messages in thread
From: Rogerio Pimentel @ 2011-09-22 17:30 UTC (permalink / raw)
To: linux-arm-kernel
Adding clock for flexcan on i.MX53
Signed-off-by: Rogerio Pimentel <rogerio.pimentel@freescale.com>
---
Changes since v2:
Rebased to imx-cleanup
arch/arm/mach-mx5/clock-mx51-mx53.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c
index a3db355..30d008f 100644
--- a/arch/arm/mach-mx5/clock-mx51-mx53.c
+++ b/arch/arm/mach-mx5/clock-mx51-mx53.c
@@ -1418,6 +1418,12 @@ DEFINE_CLOCK(ipu_di0_clk, 0, MXC_CCM_CCGR6, MXC_CCM_CCGRx_CG5_OFFSET,
DEFINE_CLOCK(ipu_di1_clk, 0, MXC_CCM_CCGR6, MXC_CCM_CCGRx_CG6_OFFSET,
NULL, NULL, &pll3_sw_clk, NULL);
+/* CAN */
+DEFINE_CLOCK(can1_clk, 0, MXC_CCM_CCGR6, MXC_CCM_CCGRx_CG10_OFFSET,
+ NULL, NULL, &ipg_clk, NULL);
+DEFINE_CLOCK(can2_clk, 1, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG3_OFFSET,
+ NULL, NULL, &ipg_clk, NULL);
+
#define _REGISTER_CLOCK(d, n, c) \
{ \
.dev_id = d, \
@@ -1507,6 +1513,8 @@ static struct clk_lookup mx53_lookups[] = {
_REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
_REGISTER_CLOCK("imx-ssi.2", NULL, ssi3_clk)
_REGISTER_CLOCK("imx-keypad", NULL, dummy_clk)
+ _REGISTER_CLOCK("flexcan.0", NULL, can1_clk)
+ _REGISTER_CLOCK("flexcan.1", NULL, can2_clk)
};
static void clk_tree_init(void)
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3 3/4] ARM: mx53: Add resources for flexcan
2011-09-22 17:30 [PATCH v3 1/4] ARM: mx53: Change pad configs for flexcan pins Rogerio Pimentel
2011-09-22 17:30 ` [PATCH v3 2/4] ARM: mx53: Add clock for flexcan Rogerio Pimentel
@ 2011-09-22 17:30 ` Rogerio Pimentel
2011-09-22 17:30 ` [PATCH v3 4/4] ARM: mx53_ard: Add flexcan support Rogerio Pimentel
2 siblings, 0 replies; 5+ messages in thread
From: Rogerio Pimentel @ 2011-09-22 17:30 UTC (permalink / raw)
To: linux-arm-kernel
Adding resources for flexcan on i.MX53
Signed-off-by: Rogerio Pimentel <rogerio.pimentel@freescale.com>
---
Changes since v2:
Rebased to imx-cleanup
arch/arm/mach-mx5/devices-imx53.h | 6 ++++++
arch/arm/plat-mxc/devices/platform-flexcan.c | 7 +++++++
arch/arm/plat-mxc/include/mach/mx53.h | 2 ++
3 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-mx5/devices-imx53.h b/arch/arm/mach-mx5/devices-imx53.h
index c27fe8b..a3e1375 100644
--- a/arch/arm/mach-mx5/devices-imx53.h
+++ b/arch/arm/mach-mx5/devices-imx53.h
@@ -40,3 +40,9 @@ extern const struct imx_imx_ssi_data imx53_imx_ssi_data[];
extern const struct imx_imx_keypad_data imx53_imx_keypad_data;
#define imx53_add_imx_keypad(pdata) \
imx_add_imx_keypad(&imx53_imx_keypad_data, pdata)
+
+extern const struct imx_flexcan_data imx53_flexcan_data[];
+#define imx53_add_flexcan(id, pdata) \
+ imx_add_flexcan(&imx53_flexcan_data[id], pdata)
+#define imx53_add_flexcan0(pdata) imx53_add_flexcan(0, pdata)
+#define imx53_add_flexcan1(pdata) imx53_add_flexcan(1, pdata)
diff --git a/arch/arm/plat-mxc/devices/platform-flexcan.c b/arch/arm/plat-mxc/devices/platform-flexcan.c
index 4e8497a..4cce16b 100644
--- a/arch/arm/plat-mxc/devices/platform-flexcan.c
+++ b/arch/arm/plat-mxc/devices/platform-flexcan.c
@@ -37,6 +37,13 @@ const struct imx_flexcan_data imx35_flexcan_data[] __initconst = {
};
#endif /* ifdef CONFIG_SOC_IMX35 */
+#ifdef CONFIG_SOC_IMX53
+const struct imx_flexcan_data imx53_flexcan_data[] __initconst = {
+ imx_flexcan_data_entry(MX53, 0, 1, SZ_16K),
+ imx_flexcan_data_entry(MX53, 1, 2, SZ_16K),
+};
+#endif /* ifdef CONFIG_SOC_IMX53 */
+
struct platform_device *__init imx_add_flexcan(
const struct imx_flexcan_data *data,
const struct flexcan_platform_data *pdata)
diff --git a/arch/arm/plat-mxc/include/mach/mx53.h b/arch/arm/plat-mxc/include/mach/mx53.h
index a37e8c3..13cb2a5 100644
--- a/arch/arm/plat-mxc/include/mach/mx53.h
+++ b/arch/arm/plat-mxc/include/mach/mx53.h
@@ -91,6 +91,8 @@
#define MX53_PWM2_BASE_ADDR (MX53_AIPS1_BASE_ADDR + 0x000B8000)
#define MX53_UART1_BASE_ADDR (MX53_AIPS1_BASE_ADDR + 0x000BC000)
#define MX53_UART2_BASE_ADDR (MX53_AIPS1_BASE_ADDR + 0x000C0000)
+#define MX53_CAN1_BASE_ADDR (MX53_AIPS1_BASE_ADDR + 0x000C8000)
+#define MX53_CAN2_BASE_ADDR (MX53_AIPS1_BASE_ADDR + 0x000CC000)
#define MX53_SRC_BASE_ADDR (MX53_AIPS1_BASE_ADDR + 0x000D0000)
#define MX53_CCM_BASE_ADDR (MX53_AIPS1_BASE_ADDR + 0x000D4000)
#define MX53_GPC_BASE_ADDR (MX53_AIPS1_BASE_ADDR + 0x000D8000)
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3 4/4] ARM: mx53_ard: Add flexcan support
2011-09-22 17:30 [PATCH v3 1/4] ARM: mx53: Change pad configs for flexcan pins Rogerio Pimentel
2011-09-22 17:30 ` [PATCH v3 2/4] ARM: mx53: Add clock for flexcan Rogerio Pimentel
2011-09-22 17:30 ` [PATCH v3 3/4] ARM: mx53: Add resources " Rogerio Pimentel
@ 2011-09-22 17:30 ` Rogerio Pimentel
2011-09-27 9:08 ` Marc Kleine-Budde
2 siblings, 1 reply; 5+ messages in thread
From: Rogerio Pimentel @ 2011-09-22 17:30 UTC (permalink / raw)
To: linux-arm-kernel
Adding flexcan support on i.MX53 ARD
Signed-off-by: Rogerio Pimentel <rogerio.pimentel@freescale.com>
---
Changes since v2:
Rebased to imx-cleanup, using gpio_request_array
instead gpio_request_one
arch/arm/mach-mx5/Kconfig | 1 +
arch/arm/mach-mx5/board-mx53_ard.c | 39 ++++++++++++++++++++++++++++++-----
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
index b4f5ab6..c71731e 100644
--- a/arch/arm/mach-mx5/Kconfig
+++ b/arch/arm/mach-mx5/Kconfig
@@ -218,6 +218,7 @@ config MACH_MX53_LOCO
config MACH_MX53_ARD
bool "Support MX53 ARD platforms"
select SOC_IMX53
+ select IMX_HAVE_PLATFORM_FLEXCAN
select IMX_HAVE_PLATFORM_IMX2_WDT
select IMX_HAVE_PLATFORM_IMX_I2C
select IMX_HAVE_PLATFORM_IMX_UART
diff --git a/arch/arm/mach-mx5/board-mx53_ard.c b/arch/arm/mach-mx5/board-mx53_ard.c
index ddc3015..e29bb23 100644
--- a/arch/arm/mach-mx5/board-mx53_ard.c
+++ b/arch/arm/mach-mx5/board-mx53_ard.c
@@ -44,6 +44,8 @@
#define ARD_BACK IMX_GPIO_NR(5, 11)
#define ARD_PROG IMX_GPIO_NR(5, 12)
#define ARD_VOLUMEUP IMX_GPIO_NR(5, 13)
+#define ARD_CAN_EN IMX_GPIO_NR(7, 6)
+#define ARD_CAN_STBY IMX_GPIO_NR(4, 15)
static iomux_v3_cfg_t mx53_ard_pads[] = {
/* UART1 */
@@ -102,6 +104,13 @@ static iomux_v3_cfg_t mx53_ard_pads[] = {
MX53_PAD_DISP0_DAT18__GPIO5_12, /* prog */
MX53_PAD_DISP0_DAT19__GPIO5_13, /* vol up */
MX53_PAD_GPIO_10__GPIO4_0, /* vol down */
+ /* CAN */
+ MX53_PAD_KEY_COL2__CAN1_TXCAN | PAD_CTL_PUS_100K_UP,
+ MX53_PAD_KEY_ROW2__CAN1_RXCAN,
+ MX53_PAD_PATA_RESET_B__CAN2_TXCAN | PAD_CTL_PUS_100K_UP,
+ MX53_PAD_PATA_IORDY__CAN2_RXCAN,
+ MX53_PAD_PATA_DA_0__GPIO7_6,
+ MX53_PAD_KEY_ROW4__GPIO4_15,
};
#define GPIO_BUTTON(gpio_num, ev_code, act_low, descr, wake) \
@@ -169,16 +178,27 @@ static struct imxi2c_platform_data mx53_ard_i2c3_data = {
.bitrate = 400000,
};
-static void __init mx53_ard_io_init(void)
+static struct gpio mx53_ard_gpios[] = {
+ { ARD_ETHERNET_INT_B, GPIOF_IN, "eth-int-b" },
+ { ARD_I2CPORTEXP_B, GPIOF_OUT_INIT_HIGH, "i2cptexp-rst" },
+ { ARD_CAN_EN, GPIOF_OUT_INIT_HIGH, "can-en" },
+ { ARD_CAN_STBY, GPIOF_OUT_INIT_HIGH, "can-stby" },
+};
+
+static int __init mx53_ard_io_init(void)
{
+ int ret;
+
mxc_iomux_v3_setup_multiple_pads(mx53_ard_pads,
ARRAY_SIZE(mx53_ard_pads));
- gpio_request(ARD_ETHERNET_INT_B, "eth-int-b");
- gpio_direction_input(ARD_ETHERNET_INT_B);
+ ret = gpio_request_array(mx53_ard_gpios,
+ ARRAY_SIZE(mx53_ard_gpios));
+
+ if (ret)
+ return ret;
- gpio_request(ARD_I2CPORTEXP_B, "i2cptexp-rst");
- gpio_direction_output(ARD_I2CPORTEXP_B, 1);
+ return 0;
}
/* Config CS1 settings for ethernet controller */
@@ -222,10 +242,15 @@ static struct platform_device *devices[] __initdata = {
static void __init mx53_ard_board_init(void)
{
+ int ret;
+
imx53_soc_init();
imx53_add_imx_uart(0, NULL);
- mx53_ard_io_init();
+ ret = mx53_ard_io_init();
+ if (ret)
+ pr_err("failed to request gpio pins: %d\n", ret);
+
weim_cs_config();
platform_add_devices(devices, ARRAY_SIZE(devices));
@@ -234,6 +259,8 @@ static void __init mx53_ard_board_init(void)
imx53_add_imx_i2c(1, &mx53_ard_i2c2_data);
imx53_add_imx_i2c(2, &mx53_ard_i2c3_data);
imx_add_gpio_keys(&ard_button_data);
+ imx53_add_flexcan0(NULL);
+ imx53_add_flexcan1(NULL);
}
static void __init mx53_ard_timer_init(void)
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3 4/4] ARM: mx53_ard: Add flexcan support
2011-09-22 17:30 ` [PATCH v3 4/4] ARM: mx53_ard: Add flexcan support Rogerio Pimentel
@ 2011-09-27 9:08 ` Marc Kleine-Budde
0 siblings, 0 replies; 5+ messages in thread
From: Marc Kleine-Budde @ 2011-09-27 9:08 UTC (permalink / raw)
To: linux-arm-kernel
On 09/22/2011 07:30 PM, Rogerio Pimentel wrote:
> Adding flexcan support on i.MX53 ARD
You probably don't want to hardwire the gpios to the can transceiver as
enabled. I suggest to attach the transceiver_switch callback.
Have a look at arch/arm/mach-mxs/mach-mx28evk.c
cheers, Marc
>
> Signed-off-by: Rogerio Pimentel <rogerio.pimentel@freescale.com>
> ---
> Changes since v2:
> Rebased to imx-cleanup, using gpio_request_array
> instead gpio_request_one
> arch/arm/mach-mx5/Kconfig | 1 +
> arch/arm/mach-mx5/board-mx53_ard.c | 39 ++++++++++++++++++++++++++++++-----
> 2 files changed, 34 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
> index b4f5ab6..c71731e 100644
> --- a/arch/arm/mach-mx5/Kconfig
> +++ b/arch/arm/mach-mx5/Kconfig
> @@ -218,6 +218,7 @@ config MACH_MX53_LOCO
> config MACH_MX53_ARD
> bool "Support MX53 ARD platforms"
> select SOC_IMX53
> + select IMX_HAVE_PLATFORM_FLEXCAN
> select IMX_HAVE_PLATFORM_IMX2_WDT
> select IMX_HAVE_PLATFORM_IMX_I2C
> select IMX_HAVE_PLATFORM_IMX_UART
> diff --git a/arch/arm/mach-mx5/board-mx53_ard.c b/arch/arm/mach-mx5/board-mx53_ard.c
> index ddc3015..e29bb23 100644
> --- a/arch/arm/mach-mx5/board-mx53_ard.c
> +++ b/arch/arm/mach-mx5/board-mx53_ard.c
> @@ -44,6 +44,8 @@
> #define ARD_BACK IMX_GPIO_NR(5, 11)
> #define ARD_PROG IMX_GPIO_NR(5, 12)
> #define ARD_VOLUMEUP IMX_GPIO_NR(5, 13)
> +#define ARD_CAN_EN IMX_GPIO_NR(7, 6)
> +#define ARD_CAN_STBY IMX_GPIO_NR(4, 15)
>
> static iomux_v3_cfg_t mx53_ard_pads[] = {
> /* UART1 */
> @@ -102,6 +104,13 @@ static iomux_v3_cfg_t mx53_ard_pads[] = {
> MX53_PAD_DISP0_DAT18__GPIO5_12, /* prog */
> MX53_PAD_DISP0_DAT19__GPIO5_13, /* vol up */
> MX53_PAD_GPIO_10__GPIO4_0, /* vol down */
> + /* CAN */
> + MX53_PAD_KEY_COL2__CAN1_TXCAN | PAD_CTL_PUS_100K_UP,
> + MX53_PAD_KEY_ROW2__CAN1_RXCAN,
> + MX53_PAD_PATA_RESET_B__CAN2_TXCAN | PAD_CTL_PUS_100K_UP,
> + MX53_PAD_PATA_IORDY__CAN2_RXCAN,
> + MX53_PAD_PATA_DA_0__GPIO7_6,
> + MX53_PAD_KEY_ROW4__GPIO4_15,
> };
>
> #define GPIO_BUTTON(gpio_num, ev_code, act_low, descr, wake) \
> @@ -169,16 +178,27 @@ static struct imxi2c_platform_data mx53_ard_i2c3_data = {
> .bitrate = 400000,
> };
>
> -static void __init mx53_ard_io_init(void)
> +static struct gpio mx53_ard_gpios[] = {
> + { ARD_ETHERNET_INT_B, GPIOF_IN, "eth-int-b" },
> + { ARD_I2CPORTEXP_B, GPIOF_OUT_INIT_HIGH, "i2cptexp-rst" },
> + { ARD_CAN_EN, GPIOF_OUT_INIT_HIGH, "can-en" },
> + { ARD_CAN_STBY, GPIOF_OUT_INIT_HIGH, "can-stby" },
> +};
> +
> +static int __init mx53_ard_io_init(void)
> {
> + int ret;
> +
> mxc_iomux_v3_setup_multiple_pads(mx53_ard_pads,
> ARRAY_SIZE(mx53_ard_pads));
>
> - gpio_request(ARD_ETHERNET_INT_B, "eth-int-b");
> - gpio_direction_input(ARD_ETHERNET_INT_B);
> + ret = gpio_request_array(mx53_ard_gpios,
> + ARRAY_SIZE(mx53_ard_gpios));
> +
> + if (ret)
> + return ret;
>
> - gpio_request(ARD_I2CPORTEXP_B, "i2cptexp-rst");
> - gpio_direction_output(ARD_I2CPORTEXP_B, 1);
> + return 0;
> }
>
> /* Config CS1 settings for ethernet controller */
> @@ -222,10 +242,15 @@ static struct platform_device *devices[] __initdata = {
>
> static void __init mx53_ard_board_init(void)
> {
> + int ret;
> +
> imx53_soc_init();
> imx53_add_imx_uart(0, NULL);
>
> - mx53_ard_io_init();
> + ret = mx53_ard_io_init();
> + if (ret)
> + pr_err("failed to request gpio pins: %d\n", ret);
> +
> weim_cs_config();
> platform_add_devices(devices, ARRAY_SIZE(devices));
>
> @@ -234,6 +259,8 @@ static void __init mx53_ard_board_init(void)
> imx53_add_imx_i2c(1, &mx53_ard_i2c2_data);
> imx53_add_imx_i2c(2, &mx53_ard_i2c3_data);
> imx_add_gpio_keys(&ard_button_data);
> + imx53_add_flexcan0(NULL);
> + imx53_add_flexcan1(NULL);
> }
>
> static void __init mx53_ard_timer_init(void)
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 262 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110927/fae961d3/attachment.sig>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-09-27 9:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-22 17:30 [PATCH v3 1/4] ARM: mx53: Change pad configs for flexcan pins Rogerio Pimentel
2011-09-22 17:30 ` [PATCH v3 2/4] ARM: mx53: Add clock for flexcan Rogerio Pimentel
2011-09-22 17:30 ` [PATCH v3 3/4] ARM: mx53: Add resources " Rogerio Pimentel
2011-09-22 17:30 ` [PATCH v3 4/4] ARM: mx53_ard: Add flexcan support Rogerio Pimentel
2011-09-27 9:08 ` 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).