summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoshni Shah <roshni.shah@timesys.com>2014-02-09 22:32:28 -0500
committerRoshni Shah <roshni.shah@timesys.com>2014-02-09 22:32:28 -0500
commit00a0b0bd1ef5a8b7a5da9bbd6bf9c361a7b37030 (patch)
treee2dd9b5dcab4b07a0ac4040b9b67ffe71dd44a60
parent29000e743e28a7174c54e81c3c45a58fe35e17ff (diff)
Quartz: Add support for UART3 and UART2 iomux defines.3.0-quartz-ts1.2
Cleaned up incorrect iomux defines.
-rw-r--r--arch/arm/mach-mvf/board-quartz.c13
-rw-r--r--arch/arm/plat-mxc/include/mach/iomux-mvf.h21
2 files changed, 27 insertions, 7 deletions
diff --git a/arch/arm/mach-mvf/board-quartz.c b/arch/arm/mach-mvf/board-quartz.c
index e146616e33c3..a25beff804a9 100644
--- a/arch/arm/mach-mvf/board-quartz.c
+++ b/arch/arm/mach-mvf/board-quartz.c
@@ -243,6 +243,18 @@ static struct platform_device mvf_twr_audio_device = {
.name = "mvf-sgtl5000",
};
+static struct imxuart_platform_data mvf_uart3_pdata = {
+ .flags = IMXUART_FIFO | IMXUART_EDMA,
+ .dma_req_rx = DMA_MUX03_UART3_RX,
+ .dma_req_tx = DMA_MUX03_UART3_TX,
+};
+
+static struct imxuart_platform_data mvf_uart2_pdata = {
+ .flags = IMXUART_FIFO | IMXUART_EDMA,
+ .dma_req_rx = DMA_MUX03_UART2_RX,
+ .dma_req_tx = DMA_MUX03_UART2_TX,
+};
+
static struct imxuart_platform_data mvf_uart1_pdata = {
.flags = IMXUART_FIFO | IMXUART_EDMA,
.dma_req_rx = DMA_MUX03_UART1_RX,
@@ -259,6 +271,7 @@ static inline void mvf_vf700_init_uart(void)
{
mvf_add_imx_uart(0, &mvf_uart0_pdata);
mvf_add_imx_uart(1, &mvf_uart1_pdata);
+ mvf_add_imx_uart(3, &mvf_uart3_pdata);
}
static struct fec_platform_data fec_data __initdata = {
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mvf.h b/arch/arm/plat-mxc/include/mach/iomux-mvf.h
index d230fa34ff39..4da66141121b 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-mvf.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mvf.h
@@ -399,13 +399,6 @@ typedef enum iomux_config {
IOMUX_PAD(0x0084, 0x0084, 1, 0x0000, 0, \
MVF600_UART_PAD_CTRL | PAD_CTL_IBE_ENABLE)
-#define MVF600_PAD26_PTB4_UART2_TX \
- IOMUX_PAD(0x0068, 0x0068, 2, 0x0380, 0, \
- MVF600_UART_PAD_CTRL | PAD_CTL_OBE_ENABLE)
-#define MVF600_PAD27_PTB5_UART3_RX \
- IOMUX_PAD(0x006C, 0x006C, 2, 0x037C, 0, \
- MVF600_UART_PAD_CTRL | PAD_CTL_IBE_ENABLE)
-
#define MVF600_PAD10_PTA20_UART3_TX \
IOMUX_PAD(0x0028, 0x0028, 6, 0x0394, 0, \
MVF600_UART_PAD_CTRL | PAD_CTL_OBE_ENABLE)
@@ -413,6 +406,20 @@ typedef enum iomux_config {
IOMUX_PAD(0x002C, 0x002C, 6, 0x0390, 0, \
MVF600_UART_PAD_CTRL | PAD_CTL_IBE_ENABLE)
+#define MVF600_PAD79_PTD0_UART2_TX \
+ IOMUX_PAD(0x013C, 0x013C, 2, 0x038C, 2, \
+ MVF600_UART_PAD_CTRL | PAD_CTL_OBE_ENABLE)
+#define MVF600_PAD80_PTD1_UART2_RX \
+ IOMUX_PAD(0x0140, 0x0140, 2, 0x0388, 2, \
+ MVF600_UART_PAD_CTRL | PAD_CTL_IBE_ENABLE)
+
+#define MVF600_PAD28_PTB6_UART2_TX \
+ IOMUX_PAD(0x0070, 0x0070, 7, 0x038C, 0, \
+ MVF600_UART_PAD_CTRL | PAD_CTL_OBE_ENABLE)
+#define MVF600_PAD29_PTB7_UART2_RX \
+ IOMUX_PAD(0x0074, 0x0074, 7, 0x0388, 0, \
+ MVF600_UART_PAD_CTRL | PAD_CTL_IBE_ENABLE)
+
/* FlexTimer channel pin */
#define MVF600_PAD22_PTB0_FTM0CH0 \
IOMUX_PAD(0x0058, 0x0058, 1, 0x0000, 0, MVF600_FTM0_CH_CTRL)