diff options
| author | Wallace Wang <r59996@freescale.com> | 2008-03-19 14:27:06 +0800 |
|---|---|---|
| committer | Daniel Schaeffer <daniel.schaeffer@timesys.com> | 2008-08-25 15:20:49 -0400 |
| commit | 4cb9d82a3088b9c3dd839819e33ca35556048cde (patch) | |
| tree | 4161ee9a914ecf66cd2933e5fa9949082e6ea2f9 /arch | |
| parent | c67b450eb20a92c9e27dacf1a737e10da4928e1a (diff) | |
ENGR00069205 CSR BT porting on i.MX31 3stack
Enable the uart2 for BT
Fix the mxc_gpio_request for none gpio pins
Signed-off-by: Wallace Wang <r59996@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx3/board-mx3_3stack.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx3/mx3_3stack_gpio.c | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/mach-mx3/board-mx3_3stack.h b/arch/arm/mach-mx3/board-mx3_3stack.h index 78a1e925c4ea..bd98dc555c39 100644 --- a/arch/arm/mach-mx3/board-mx3_3stack.h +++ b/arch/arm/mach-mx3/board-mx3_3stack.h @@ -71,7 +71,7 @@ /*! @} */ /* UART 2 configuration */ #define UART2_MODE MODE_DCE -#define UART2_IR IRDA +#define UART2_IR NO_IRDA #define UART2_ENABLED 1 /* UART 3 configuration */ #define UART3_MODE MODE_DTE diff --git a/arch/arm/mach-mx3/mx3_3stack_gpio.c b/arch/arm/mach-mx3/mx3_3stack_gpio.c index d99c6acf9679..eaf9e0f30efb 100644 --- a/arch/arm/mach-mx3/mx3_3stack_gpio.c +++ b/arch/arm/mach-mx3/mx3_3stack_gpio.c @@ -112,17 +112,15 @@ void gpio_uart_inactive(int port, int no_irda) case 1: mxc_request_gpio(MX31_PIN_TXD2); mxc_request_gpio(MX31_PIN_RXD2); - mxc_request_gpio(MX31_PIN_RTS2); - mxc_request_gpio(MX31_PIN_CTS2); mxc_free_iomux(MX31_PIN_TXD2, OUTPUTCONFIG_GPIO, INPUTCONFIG_GPIO); mxc_free_iomux(MX31_PIN_RXD2, OUTPUTCONFIG_GPIO, INPUTCONFIG_GPIO); - mxc_free_iomux(MX31_PIN_RTS2, OUTPUTCONFIG_GPIO, - INPUTCONFIG_GPIO); - mxc_free_iomux(MX31_PIN_CTS2, OUTPUTCONFIG_GPIO, - INPUTCONFIG_GPIO); + mxc_free_iomux(MX31_PIN_RTS2, OUTPUTCONFIG_FUNC, + INPUTCONFIG_FUNC); + mxc_free_iomux(MX31_PIN_CTS2, OUTPUTCONFIG_FUNC, + INPUTCONFIG_FUNC); break; default: break; |