diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-07-13 15:08:19 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-07-13 15:08:19 -0700 |
| commit | e8d0217aed2c8f973680c78f8028874e2c47b964 (patch) | |
| tree | d57740b6f77f8c21a9812335f1060f29781dc571 | |
| parent | 4f6f427b0d72b6730d0c07d9aa0a1e289802b4c4 (diff) | |
disable SDMA on UARTs
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6_h.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6_nit6xlite.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6_nitrogen6x.c | 12 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6_oc.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6_s.c | 12 |
5 files changed, 9 insertions, 27 deletions
diff --git a/arch/arm/mach-mx6/board-mx6_h.c b/arch/arm/mach-mx6/board-mx6_h.c index b8c047c23ef4..40a6bf40e172 100644 --- a/arch/arm/mach-mx6/board-mx6_h.c +++ b/arch/arm/mach-mx6/board-mx6_h.c @@ -244,9 +244,7 @@ static const struct anatop_thermal_platform_data }; static const struct imxuart_platform_data plat_uart2 __initconst = { - .flags = IMXUART_HAVE_RTSCTS | IMXUART_SDMA, - .dma_req_rx = MX6Q_DMA_REQ_UART3_RX, - .dma_req_tx = MX6Q_DMA_REQ_UART3_TX, + .flags = IMXUART_HAVE_RTSCTS, }; static int fec_phy_init(struct phy_device *phydev) diff --git a/arch/arm/mach-mx6/board-mx6_nit6xlite.c b/arch/arm/mach-mx6/board-mx6_nit6xlite.c index 25e78ebcd7e3..11b041d5ff6a 100644 --- a/arch/arm/mach-mx6/board-mx6_nit6xlite.c +++ b/arch/arm/mach-mx6/board-mx6_nit6xlite.c @@ -248,9 +248,7 @@ static const struct anatop_thermal_platform_data }; static const struct imxuart_platform_data mx6_arm2_uart2_data __initconst = { - .flags = IMXUART_HAVE_RTSCTS | IMXUART_SDMA, - .dma_req_rx = MX6Q_DMA_REQ_UART3_RX, - .dma_req_tx = MX6Q_DMA_REQ_UART3_TX, + .flags = IMXUART_HAVE_RTSCTS, }; static int mx6_fec_phy_init(struct phy_device *phydev) diff --git a/arch/arm/mach-mx6/board-mx6_nitrogen6x.c b/arch/arm/mach-mx6/board-mx6_nitrogen6x.c index bcc96739a2db..5e479332dcbb 100644 --- a/arch/arm/mach-mx6/board-mx6_nitrogen6x.c +++ b/arch/arm/mach-mx6/board-mx6_nitrogen6x.c @@ -256,22 +256,16 @@ static const struct anatop_thermal_platform_data }; static const struct imxuart_platform_data mx6_arm2_uart2_data __initconst = { - .flags = IMXUART_HAVE_RTSCTS | IMXUART_SDMA, - .dma_req_rx = MX6Q_DMA_REQ_UART3_RX, - .dma_req_tx = MX6Q_DMA_REQ_UART3_TX, + .flags = IMXUART_HAVE_RTSCTS, }; #if !(defined(CONFIG_MXC_CAMERA_OV5642) || defined(CONFIG_MXC_CAMERA_OV5642_MODULE)) static const struct imxuart_platform_data mx6_arm2_uart3_data __initconst = { - .flags = IMXUART_HAVE_RTSCTS | IMXUART_SDMA, - .dma_req_rx = MX6Q_DMA_REQ_UART4_RX, - .dma_req_tx = MX6Q_DMA_REQ_UART4_TX, + .flags = IMXUART_HAVE_RTSCTS, }; static const struct imxuart_platform_data mx6_arm2_uart4_data __initconst = { - .flags = IMXUART_HAVE_RTSCTS | IMXUART_SDMA, - .dma_req_rx = MX6Q_DMA_REQ_UART5_RX, - .dma_req_tx = MX6Q_DMA_REQ_UART5_TX, + .flags = IMXUART_HAVE_RTSCTS, }; #endif diff --git a/arch/arm/mach-mx6/board-mx6_oc.c b/arch/arm/mach-mx6/board-mx6_oc.c index a472ab9dee2b..79dfa5320daf 100644 --- a/arch/arm/mach-mx6/board-mx6_oc.c +++ b/arch/arm/mach-mx6/board-mx6_oc.c @@ -259,9 +259,7 @@ static const struct anatop_thermal_platform_data }; static const struct imxuart_platform_data mx6_arm2_uart2_data __initconst = { - .flags = IMXUART_HAVE_RTSCTS | IMXUART_SDMA, - .dma_req_rx = MX6Q_DMA_REQ_UART3_RX, - .dma_req_tx = MX6Q_DMA_REQ_UART3_TX, + .flags = IMXUART_HAVE_RTSCTS, }; static int mx6_oc_fec_phy_init(struct phy_device *phydev) diff --git a/arch/arm/mach-mx6/board-mx6_s.c b/arch/arm/mach-mx6/board-mx6_s.c index 9ffaccc7c49b..bb1b80c9ecf8 100644 --- a/arch/arm/mach-mx6/board-mx6_s.c +++ b/arch/arm/mach-mx6/board-mx6_s.c @@ -250,21 +250,15 @@ static const struct anatop_thermal_platform_data }; static const struct imxuart_platform_data mx6_arm2_uart2_data __initconst = { - .flags = IMXUART_HAVE_RTSCTS | IMXUART_SDMA, - .dma_req_rx = MX6Q_DMA_REQ_UART3_RX, - .dma_req_tx = MX6Q_DMA_REQ_UART3_TX, + .flags = IMXUART_HAVE_RTSCTS, }; static const struct imxuart_platform_data mx6_arm2_uart3_data __initconst = { - .flags = IMXUART_HAVE_RTSCTS | IMXUART_SDMA, - .dma_req_rx = MX6Q_DMA_REQ_UART4_RX, - .dma_req_tx = MX6Q_DMA_REQ_UART4_TX, + .flags = IMXUART_HAVE_RTSCTS, }; static const struct imxuart_platform_data mx6_arm2_uart4_data __initconst = { - .flags = IMXUART_HAVE_RTSCTS | IMXUART_SDMA, - .dma_req_rx = MX6Q_DMA_REQ_UART5_RX, - .dma_req_tx = MX6Q_DMA_REQ_UART5_TX, + .flags = IMXUART_HAVE_RTSCTS, }; static unsigned short ksz9031_por_cmds[] = { |