From 67f2a87f92716c3126415e114af57164736bbca5 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 25 Jan 2011 13:08:33 -0200 Subject: ARM: mach-mx5: Fix build for mx53_loco and mx53_smd Commit 816ad74 (ARM: i.MX53: Add full iomux support for mx53) renamed some of the pad names. Make the changes accordingly so that mx53_loco and mx53_cmd can build without errors. Signed-off-by: Fabio Estevam Acked-by: Richard Zhao Signed-off-by: Sascha Hauer --- arch/arm/mach-mx5/board-mx53_smd.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'arch/arm/mach-mx5/board-mx53_smd.c') diff --git a/arch/arm/mach-mx5/board-mx53_smd.c b/arch/arm/mach-mx5/board-mx53_smd.c index 7970f7a..06070c5 100644 --- a/arch/arm/mach-mx5/board-mx53_smd.c +++ b/arch/arm/mach-mx5/board-mx53_smd.c @@ -39,20 +39,20 @@ #define SMD_FEC_PHY_RST IMX_GPIO_NR(7, 6) static iomux_v3_cfg_t mx53_smd_pads[] = { - MX53_PAD_CSI0_D10__UART1_TXD, - MX53_PAD_CSI0_D11__UART1_RXD, - MX53_PAD_ATA_DIOW__UART1_TXD, - MX53_PAD_ATA_DMACK__UART1_RXD, - - MX53_PAD_ATA_BUFFER_EN__UART2_RXD, - MX53_PAD_ATA_DMARQ__UART2_TXD, - MX53_PAD_ATA_DIOR__UART2_RTS, - MX53_PAD_ATA_INTRQ__UART2_CTS, - - MX53_PAD_ATA_CS_0__UART3_TXD, - MX53_PAD_ATA_CS_1__UART3_RXD, - MX53_PAD_ATA_DA_1__UART3_CTS, - MX53_PAD_ATA_DA_2__UART3_RTS, + MX53_PAD_CSI0_DAT10__UART1_TXD_MUX, + MX53_PAD_CSI0_DAT11__UART1_RXD_MUX, + MX53_PAD_PATA_DIOW__UART1_TXD_MUX, + MX53_PAD_PATA_DMACK__UART1_RXD_MUX, + + MX53_PAD_PATA_BUFFER_EN__UART2_RXD_MUX, + MX53_PAD_PATA_DMARQ__UART2_TXD_MUX, + MX53_PAD_PATA_DIOR__UART2_RTS, + MX53_PAD_PATA_INTRQ__UART2_CTS, + + MX53_PAD_PATA_CS_0__UART3_TXD_MUX, + MX53_PAD_PATA_CS_1__UART3_RXD_MUX, + MX53_PAD_PATA_DA_1__UART3_CTS, + MX53_PAD_PATA_DA_2__UART3_RTS, }; static const struct imxuart_platform_data mx53_smd_uart_data __initconst = { -- cgit v1.1 From cdb2daa4ffcb331d08e356ed66b57bd14d105746 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 31 Jan 2011 10:32:27 -0200 Subject: ARM: mx5/board-mx53_smd.c: Make UART1 functional Fix UART1 IOMUX settings and configure UART1 to work with only RX/TX pins. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer --- arch/arm/mach-mx5/board-mx53_smd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'arch/arm/mach-mx5/board-mx53_smd.c') diff --git a/arch/arm/mach-mx5/board-mx53_smd.c b/arch/arm/mach-mx5/board-mx53_smd.c index 06070c5..c7b45d4 100644 --- a/arch/arm/mach-mx5/board-mx53_smd.c +++ b/arch/arm/mach-mx5/board-mx53_smd.c @@ -41,8 +41,6 @@ static iomux_v3_cfg_t mx53_smd_pads[] = { MX53_PAD_CSI0_DAT10__UART1_TXD_MUX, MX53_PAD_CSI0_DAT11__UART1_RXD_MUX, - MX53_PAD_PATA_DIOW__UART1_TXD_MUX, - MX53_PAD_PATA_DMACK__UART1_RXD_MUX, MX53_PAD_PATA_BUFFER_EN__UART2_RXD_MUX, MX53_PAD_PATA_DMARQ__UART2_TXD_MUX, @@ -61,7 +59,7 @@ static const struct imxuart_platform_data mx53_smd_uart_data __initconst = { static inline void mx53_smd_init_uart(void) { - imx53_add_imx_uart(0, &mx53_smd_uart_data); + imx53_add_imx_uart(0, NULL); imx53_add_imx_uart(1, &mx53_smd_uart_data); imx53_add_imx_uart(2, &mx53_smd_uart_data); } -- cgit v1.1 From ab130421269aec9bf83d8ef5b7ceda80e2619599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Mon, 7 Feb 2011 16:35:21 +0100 Subject: ARM: mx5: use .init_early to initialize cpu type, reset address and iomuxer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This used to be done in .map_io which is supposed to only setup the memory mapping. Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer --- arch/arm/mach-mx5/board-mx53_smd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/arm/mach-mx5/board-mx53_smd.c') diff --git a/arch/arm/mach-mx5/board-mx53_smd.c b/arch/arm/mach-mx5/board-mx53_smd.c index c7b45d4..fa0fad8 100644 --- a/arch/arm/mach-mx5/board-mx53_smd.c +++ b/arch/arm/mach-mx5/board-mx53_smd.c @@ -103,7 +103,8 @@ static struct sys_timer mx53_smd_timer = { MACHINE_START(MX53_SMD, "Freescale MX53 SMD Board") .map_io = mx53_map_io, + .init_early = imx53_init_early, .init_irq = mx53_init_irq, - .init_machine = mx53_smd_board_init, .timer = &mx53_smd_timer, + .init_machine = mx53_smd_board_init, MACHINE_END -- cgit v1.1 From daa7954ccd8a0e99376d52c46978f16067f8c2de Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 17 Feb 2011 18:09:53 -0200 Subject: ARM: mach-mx5: Add watchdog support for MX53 based boards Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer --- arch/arm/mach-mx5/board-mx53_smd.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-mx5/board-mx53_smd.c') diff --git a/arch/arm/mach-mx5/board-mx53_smd.c b/arch/arm/mach-mx5/board-mx53_smd.c index fa0fad8..8a8694c 100644 --- a/arch/arm/mach-mx5/board-mx53_smd.c +++ b/arch/arm/mach-mx5/board-mx53_smd.c @@ -90,6 +90,7 @@ static void __init mx53_smd_board_init(void) mx53_smd_init_uart(); mx53_smd_fec_reset(); imx53_add_fec(&mx53_smd_fec_data); + imx53_add_imx2_wdt(0, NULL); } static void __init mx53_smd_timer_init(void) -- cgit v1.1 From 2093023889b8c15bb90acb435e33e2843ef0153c Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 1 Mar 2011 16:59:48 -0300 Subject: ARM: mx53_smd: Add I2C support Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer --- arch/arm/mach-mx5/board-mx53_smd.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'arch/arm/mach-mx5/board-mx53_smd.c') diff --git a/arch/arm/mach-mx5/board-mx53_smd.c b/arch/arm/mach-mx5/board-mx53_smd.c index 8a8694c..5eb1638 100644 --- a/arch/arm/mach-mx5/board-mx53_smd.c +++ b/arch/arm/mach-mx5/board-mx53_smd.c @@ -51,6 +51,9 @@ static iomux_v3_cfg_t mx53_smd_pads[] = { MX53_PAD_PATA_CS_1__UART3_RXD_MUX, MX53_PAD_PATA_DA_1__UART3_CTS, MX53_PAD_PATA_DA_2__UART3_RTS, + /* I2C1 */ + MX53_PAD_CSI0_DAT8__I2C1_SDA, + MX53_PAD_CSI0_DAT9__I2C1_SCL, }; static const struct imxuart_platform_data mx53_smd_uart_data __initconst = { @@ -83,6 +86,10 @@ static struct fec_platform_data mx53_smd_fec_data = { .phy = PHY_INTERFACE_MODE_RMII, }; +static const struct imxi2c_platform_data mx53_smd_i2c_data __initconst = { + .bitrate = 100000, +}; + static void __init mx53_smd_board_init(void) { mxc_iomux_v3_setup_multiple_pads(mx53_smd_pads, @@ -91,6 +98,7 @@ static void __init mx53_smd_board_init(void) mx53_smd_fec_reset(); imx53_add_fec(&mx53_smd_fec_data); imx53_add_imx2_wdt(0, NULL); + imx53_add_imx_i2c(0, &mx53_smd_i2c_data); } static void __init mx53_smd_timer_init(void) -- cgit v1.1 From d79c01b0a212ae25c7b2c63274fffacf38dbcaaa Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 2 Mar 2011 13:30:52 -0300 Subject: ARM: mx5/mx53_smd: Fix IOMUX for UART2 On mx53_smd board only RX/TX pins are used on UART2. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer --- arch/arm/mach-mx5/board-mx53_smd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'arch/arm/mach-mx5/board-mx53_smd.c') diff --git a/arch/arm/mach-mx5/board-mx53_smd.c b/arch/arm/mach-mx5/board-mx53_smd.c index 5eb1638..31e1732 100644 --- a/arch/arm/mach-mx5/board-mx53_smd.c +++ b/arch/arm/mach-mx5/board-mx53_smd.c @@ -44,8 +44,6 @@ static iomux_v3_cfg_t mx53_smd_pads[] = { MX53_PAD_PATA_BUFFER_EN__UART2_RXD_MUX, MX53_PAD_PATA_DMARQ__UART2_TXD_MUX, - MX53_PAD_PATA_DIOR__UART2_RTS, - MX53_PAD_PATA_INTRQ__UART2_CTS, MX53_PAD_PATA_CS_0__UART3_TXD_MUX, MX53_PAD_PATA_CS_1__UART3_RXD_MUX, @@ -63,7 +61,7 @@ static const struct imxuart_platform_data mx53_smd_uart_data __initconst = { static inline void mx53_smd_init_uart(void) { imx53_add_imx_uart(0, NULL); - imx53_add_imx_uart(1, &mx53_smd_uart_data); + imx53_add_imx_uart(1, NULL); imx53_add_imx_uart(2, &mx53_smd_uart_data); } -- cgit v1.1