aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx6
diff options
context:
space:
mode:
authorLionel Xu <Lionel.Xu@freescale.com>2011-11-16 16:57:27 +0800
committerEric Miao <eric.miao@linaro.org>2011-12-01 11:36:38 +0800
commitf6c4c0b11439580a27a5e1a26c75a3bb5b69fafb (patch)
tree07a06c069889e199af1bce041e4364efb7da1dfd /arch/arm/mach-mx6
parent06a1a475c0e6356361ecab4e721ba397d63585aa (diff)
ENGR00139276-1 MX6 BT: Add basic bluetooth support to mx6 platform
Add basic bluetooth support to mx6q platform: 1) Enable bluetooth driver by default 2) Configure uart2 which is used by bluetooth Signed-off-by: Lionel Xu <Lionel.Xu@freescale.com>
Diffstat (limited to 'arch/arm/mach-mx6')
-rw-r--r--arch/arm/mach-mx6/board-mx6q_arm2.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_arm2.c b/arch/arm/mach-mx6/board-mx6q_arm2.c
index 21296ee0f6a..99a183c9d86 100644
--- a/arch/arm/mach-mx6/board-mx6q_arm2.c
+++ b/arch/arm/mach-mx6/board-mx6q_arm2.c
@@ -273,12 +273,15 @@ static iomux_v3_cfg_t mx6q_arm2_pads[] = {
MX6Q_PAD_EIM_D24__GPIO_3_24,
+ /* UART2 */
+ MX6Q_PAD_EIM_D26__UART2_RXD,
+ MX6Q_PAD_EIM_D27__UART2_TXD,
+ MX6Q_PAD_EIM_D28__UART2_RTS,
+ MX6Q_PAD_EIM_D29__UART2_CTS,
+
/* PWM1 */
MX6Q_PAD_GPIO_9__PWM1_PWMO,
- /* DISP0 I2C ENABLE*/
- MX6Q_PAD_EIM_D28__GPIO_3_28,
-
/* DISP0 DET */
MX6Q_PAD_EIM_D31__GPIO_3_31,
@@ -469,10 +472,14 @@ static const struct anatop_thermal_platform_data
.name = "anatop_thermal",
};
+static const struct imxuart_platform_data mx6q_uart1_data __initconst = {
+ .flags = IMXUART_HAVE_RTSCTS | IMXUART_USE_DCEDTE,
+};
+
static inline void mx6q_arm2_init_uart(void)
{
imx6q_add_imx_uart(0, NULL);
- imx6q_add_imx_uart(1, NULL);
+ imx6q_add_imx_uart(1, &mx6q_uart1_data);
imx6q_add_imx_uart(3, NULL);
}