diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2014-03-18 11:25:11 +0100 |
---|---|---|
committer | Stefan Agner <stefan.agner@toradex.com> | 2014-03-18 11:25:11 +0100 |
commit | 72249651843f93d50c302833546fb2880052a80f (patch) | |
tree | 172a8af74ce161bc276856d7331dc0076055093c /arch/arm/mach-mvf/board-twr-vf700.c | |
parent | aef4075a0bcc7860eafa17be0c6e6cfcecc68206 (diff) | |
parent | 50c4c848d6b8743894cfcec166db475ef6140504 (diff) |
Merge tag '3.0-vybrid-ts2.13' into colibri_vfColibri_VF_LinuxImageV2.1Beta3_20140318
3.0-vybrid-ts2.13
Diffstat (limited to 'arch/arm/mach-mvf/board-twr-vf700.c')
-rw-r--r-- | arch/arm/mach-mvf/board-twr-vf700.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-mvf/board-twr-vf700.c b/arch/arm/mach-mvf/board-twr-vf700.c index 5e5fec968711..3c19b1c70ec9 100644 --- a/arch/arm/mach-mvf/board-twr-vf700.c +++ b/arch/arm/mach-mvf/board-twr-vf700.c @@ -101,6 +101,8 @@ static iomux_v3_cfg_t mvf600_pads[] = { /*I2C0*/ MVF600_PAD36_PTB14__I2C0_SCL, MVF600_PAD37_PTB15__I2C0_SDA, + + MVF600_PAD38_PTB16_USER_BTN1, #if 0 /*CAN1*/ @@ -252,6 +254,12 @@ static struct imxuart_platform_data mvf_uart1_pdata = { .dma_req_tx = DMA_MUX03_UART1_TX, }; +static struct imxuart_platform_data mvf_uart0_pdata = { + .flags = IMXUART_FIFO | IMXUART_EDMA, + .dma_req_rx = DMA_MUX03_UART0_RX, + .dma_req_tx = DMA_MUX03_UART0_TX, +}; + static inline void mvf_vf700_init_uart(void) { mvf_add_imx_uart(1, &mvf_uart1_pdata); |