From: Lauren Post <lauren.post@freescale.com>
Date: Wed, 21 Jan 2015 14:44:42 +0000 (-0600)
Subject: imx6qsabresd.conf: Add imx6q-sabresd-uart device tree
X-Git-Tag: 2.1~680
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=dc85122121c15ff3fac5286ee2856375768bca60;p=meta-freescale.git

imx6qsabresd.conf: Add imx6q-sabresd-uart device tree

Add uart5 DTE mode pinctrl set for imx6q-sabresd board becuase
of pin conflict.

Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/meta-fsl-arm/conf/machine/imx6qsabresd.conf b/meta-fsl-arm/conf/machine/imx6qsabresd.conf
index 02b7cdc7..72d1da5d 100644
--- a/meta-fsl-arm/conf/machine/imx6qsabresd.conf
+++ b/meta-fsl-arm/conf/machine/imx6qsabresd.conf
@@ -9,7 +9,7 @@ require conf/machine/include/imx6sabresd-common.inc
 SOC_FAMILY = "mx6:mx6q"
 
 KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
-                     imx6q-sabresd-enetirq.dtb"
+                     imx6q-sabresd-enetirq.dtb imx6q-sabresd-uart.dtb"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6qsabresd_config,sdcard"