diff options
author | Eric Nelson <eric.nelson@boundarydevices.com> | 2012-08-29 20:46:57 -0700 |
---|---|---|
committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2012-08-31 18:03:17 -0700 |
commit | 21f131901161431c28676501a89060bfe27e7e23 (patch) | |
tree | 86a89f0e4a3a1c6cbfdac55bec433b5546f71cea /arch | |
parent | c047c342c24e0d319f949a9f55f4d69fb2b53b7c (diff) |
i.MX6: mx6q_sabrelite: Sabre Lite doesn't expose UART3, Nitrogen6W does
Diffstat (limited to 'arch')
-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); |