summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@freescale.com>2013-09-06 14:12:24 +0800
committerJason Liu <r64343@freescale.com>2013-10-30 09:55:34 +0800
commit1391321169bd5e9fc6a2a508511865cf19c88eed (patch)
treef35583061abd5924c21017abab50d3e5f1240714 /arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts
parent605b4cf50a7be1d5e3de307012c06b4a03150927 (diff)
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. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts')
-rw-r--r--arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts42
1 files changed, 42 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts b/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts
new file mode 100644
index 000000000000..6b31efbf75b2
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx6q-sabreauto.dts"
+
+&ecspi1 {
+ /* pin conflict with weim */
+ status = "disabled";
+};
+
+&gpmi {
+ status = "okay";
+};
+
+&i2c3 {
+ /* pin conflict with weim */
+ status = "disabled";
+};
+
+&uart3 {
+ /* pin conflict with gpmi and weim */
+ status = "disabled";
+};
+
+&usbh1 {
+ /* max7310_b on i2c3 is gone */
+ status = "disabled";
+};
+
+&usbotg {
+ /* max7310_c on i2c3 is gone */
+ status = "disabled";
+};
+
+&weim {
+ status = "okay";
+};