diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2012-08-29 20:46:57 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2012-10-14 14:32:17 -0700 |
| commit | 2c6296352657a0450d52ebf63905325c19308a25 (patch) | |
| tree | 7f38f5838892057ad2ba4d4302d77c98b91dd9e7 | |
| parent | 9620520c08b049491d44099ba89cc28b01efdebe (diff) | |
i.MX6: mx6q_sabrelite: Sabre Lite doesn't expose UART3, Nitrogen6W does
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabrelite.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabrelite.c b/arch/arm/mach-mx6/board-mx6q_sabrelite.c index 7aaca249dc90..eafd4c497ff6 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabrelite.c +++ b/arch/arm/mach-mx6/board-mx6q_sabrelite.c @@ -496,14 +496,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 */ @@ -1234,6 +1226,12 @@ static void __init mx6_sabrelite_board_init(void) gp_reg_id = sabrelite_dvfscore_data.reg_id; soc_reg_id = sabrelite_dvfscore_data.soc_id; pu_reg_id = sabrelite_dvfscore_data.pu_id; + + imx6q_add_imx_uart(0, NULL); + imx6q_add_imx_uart(1, NULL); + if (isn6) + imx6q_add_imx_uart(2, &mx6_arm2_uart2_data); + mx6q_sabrelite_init_uart(); imx6q_add_mxc_hdmi_core(&hdmi_core_data); |