diff options
| author | Rob Herring <r.herring@freescale.com> | 2010-01-22 15:01:53 -0200 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-24 12:16:00 +0200 |
| commit | a68365507942861ae2ce9e4dc4e225977a96f15f (patch) | |
| tree | 1b689cfaa6bdb98074b0f4717b7fe498a312b41b /arch/arm/mach-mx25/serial.c | |
| parent | 6ae58a9778c7a99ae0f496ca10deafe87b0dae0b (diff) | |
ENGR00120394-1 imx: remove unneeded spba related code
The spba defaults to all masters enabled and this is fine as
all chips only have ARM and SDMA as masters.
Signed-off-by: Rob Herring <r.herring@freescale.com>
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'arch/arm/mach-mx25/serial.c')
| -rw-r--r-- | arch/arm/mach-mx25/serial.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/arch/arm/mach-mx25/serial.c b/arch/arm/mach-mx25/serial.c index d71dd1082f2f..3029eb49c2ea 100644 --- a/arch/arm/mach-mx25/serial.c +++ b/arch/arm/mach-mx25/serial.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -22,7 +22,6 @@ #include <linux/serial.h> #include <mach/hardware.h> #include <mach/mxc_uart.h> -#include <mach/spba.h> #include "serial.h" #include "board-mx25_3stack.h" @@ -57,7 +56,6 @@ static uart_mxc_port mxc_ports[] = { .dma_rxbuf_size = UART1_DMA_RXBUFSIZE, .rx_threshold = UART1_UFCR_RXTL, .tx_threshold = UART1_UFCR_TXTL, - .shared = UART1_SHARED_PERI, .dma_tx_id = MXC_DMA_UART1_TX, .dma_rx_id = MXC_DMA_UART1_RX, .rxd_mux = MXC_UART_RXDMUX, @@ -83,7 +81,6 @@ static uart_mxc_port mxc_ports[] = { .dma_rxbuf_size = UART2_DMA_RXBUFSIZE, .rx_threshold = UART2_UFCR_RXTL, .tx_threshold = UART2_UFCR_TXTL, - .shared = UART2_SHARED_PERI, .dma_tx_id = MXC_DMA_UART2_TX, .dma_rx_id = MXC_DMA_UART2_RX, .rxd_mux = MXC_UART_IR_RXDMUX, @@ -110,7 +107,6 @@ static uart_mxc_port mxc_ports[] = { .dma_rxbuf_size = UART3_DMA_RXBUFSIZE, .rx_threshold = UART3_UFCR_RXTL, .tx_threshold = UART3_UFCR_TXTL, - .shared = UART3_SHARED_PERI, .dma_tx_id = MXC_DMA_UART3_TX, .dma_rx_id = MXC_DMA_UART3_RX, .rxd_mux = MXC_UART_RXDMUX, @@ -138,7 +134,6 @@ static uart_mxc_port mxc_ports[] = { .dma_rxbuf_size = UART4_DMA_RXBUFSIZE, .rx_threshold = UART4_UFCR_RXTL, .tx_threshold = UART4_UFCR_TXTL, - .shared = UART4_SHARED_PERI, .dma_tx_id = MXC_DMA_UART4_TX, .dma_rx_id = MXC_DMA_UART4_RX, .rxd_mux = MXC_UART_RXDMUX, @@ -166,7 +161,6 @@ static uart_mxc_port mxc_ports[] = { .dma_rxbuf_size = UART5_DMA_RXBUFSIZE, .rx_threshold = UART5_UFCR_RXTL, .tx_threshold = UART5_UFCR_TXTL, - .shared = UART5_SHARED_PERI, .dma_tx_id = MXC_DMA_UART5_TX, .dma_rx_id = MXC_DMA_UART5_RX, .rxd_mux = MXC_UART_RXDMUX, @@ -224,29 +218,13 @@ static int __init mxc_init_uart(void) platform_device_register(&mxc_uart_device1); platform_device_register(&mxc_uart_device2); - /* Grab ownership of shared UARTs 3 and 4, only when enabled */ #if UART3_ENABLED == 1 -#if UART3_DMA_ENABLE == 1 - spba_take_ownership(UART3_SHARED_PERI, (SPBA_MASTER_A | SPBA_MASTER_C)); -#else - spba_take_ownership(UART3_SHARED_PERI, SPBA_MASTER_A); -#endif /* UART3_DMA_ENABLE */ platform_device_register(&mxc_uart_device3); #endif /* UART3_ENABLED */ #if UART4_ENABLED == 1 -#if UART4_DMA_ENABLE == 1 - spba_take_ownership(UART4_SHARED_PERI, (SPBA_MASTER_A | SPBA_MASTER_C)); -#else - spba_take_ownership(UART4_SHARED_PERI, SPBA_MASTER_A); -#endif /* UARTr_DMA_ENABLE */ platform_device_register(&mxc_uart_device4); #endif /* UART4_ENABLED */ #if UART5_ENABLED == 1 -#if UART5_DMA_ENABLE == 1 - spba_take_ownership(UART5_SHARED_PERI, (SPBA_MASTER_A | SPBA_MASTER_C)); -#else - spba_take_ownership(UART5_SHARED_PERI, SPBA_MASTER_A); -#endif /* UART5_DMA_ENABLE */ platform_device_register(&mxc_uart_device5); #endif /* UART5_ENABLED */ |