diff options
| author | Lauren Post <lauren.post@freescale.com> | 2013-10-01 11:31:52 -0500 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-11-13 13:59:00 -0200 |
| commit | 2fd8e299c1ecda233672a3a5eb2146d5bc15476b (patch) | |
| tree | 579cc609123ec5281a22431ae1d1b1aac63b18ba | |
| parent | be62b60d589df32476bbbc58d653dd37b337511e (diff) | |
| download | meta-fsl-arm-2fd8e299c1ecda233672a3a5eb2146d5bc15476b.tar.gz | |
imx6qsabreauto.conf: Add gpmi-weim DTS
ENGR00269945: ARM: imx6: add the secondary sabreauto dts for pin conflict
The patch is to solve the pin conflicts between devices that are
currently added in imx6qdl-sabreauto dts file. It has ecspi1, i2c3, and
uart3 enabled while gpmi and weim disabled in the primary
imx6qdl-sabreauto.dtsi, and creates the secondary
imx6q/dl-sabreauto dts to have gpmi and weim enabled while others
disabled. Since usbh1 and usbotg depend on GPIO from max7310 on i2c3,
they have to be disabled as well in the secondary sabreauto dts files.
Change-Id: I6338e60fa8c1622b2a73e99aa1e3def0a2555bc2
Signed-off-by: Lauren Post <lauren.post@freescale.com>
| -rw-r--r-- | conf/machine/imx6qsabreauto.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf index 4d367db..7455255 100644 --- a/conf/machine/imx6qsabreauto.conf +++ b/conf/machine/imx6qsabreauto.conf | |||
| @@ -7,7 +7,7 @@ require conf/machine/include/imx6sabreauto-common.inc | |||
| 7 | 7 | ||
| 8 | SOC_FAMILY = "mx6:mx6q" | 8 | SOC_FAMILY = "mx6:mx6q" |
| 9 | 9 | ||
| 10 | KERNEL_DEVICETREE = "imx6q-sabreauto.dtb" | 10 | KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb" |
| 11 | 11 | ||
| 12 | UBOOT_CONFIG ??= "sd" | 12 | UBOOT_CONFIG ??= "sd" |
| 13 | UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard" | 13 | UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard" |