diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2012-06-24 15:00:27 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2012-06-24 16:34:33 -0700 |
| commit | 724d451ecc1ad694a2c955108e0a3fe752bbb6ed (patch) | |
| tree | 1510e233ec287509e87d9bdb5b9cba5a23764c2a | |
| parent | 1150278bbe137cb5039f8e3f97f99b9e9919f4c2 (diff) | |
i.MX6: mx6q_sabrelite: Sabre Lite doesn't expose UART3, Nitrogen6W does
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabrelite.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabrelite.c b/arch/arm/mach-mx6/board-mx6q_sabrelite.c index 208ebc139323..682f7992e0ca 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabrelite.c +++ b/arch/arm/mach-mx6/board-mx6q_sabrelite.c @@ -478,14 +478,6 @@ static const struct imxuart_platform_data mx6_arm2_uart2_data __initconst = { .dma_req_tx = MX6Q_DMA_REQ_UART3_TX, }; - -static inline void mx6q_sabrelite_init_uart(void) -{ - imx6q_add_imx_uart(0, NULL); - imx6q_add_imx_uart(1, NULL); - imx6q_add_imx_uart(2, &mx6_arm2_uart2_data); -} - static int mx6q_sabrelite_fec_phy_init(struct phy_device *phydev) { /* prefer master mode, disable 1000 Base-T capable */ @@ -1148,7 +1140,12 @@ static void __init mx6_sabrelite_board_init(void) #endif gp_reg_id = sabrelite_dvfscore_data.reg_id; - mx6q_sabrelite_init_uart(); + + imx6q_add_imx_uart(0, NULL); + imx6q_add_imx_uart(1, NULL); + if (isn6) + imx6q_add_imx_uart(2, &mx6_arm2_uart2_data); + imx6q_add_mxc_hdmi_core(&hdmi_core_data); imx6q_add_ipuv3(0, &ipu_data[0]); |