]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ENGR00333048 ARM: dts: add new dts for gpmi and weim on imx6q sabreauto
authorAllen Xu <b45815@freescale.com>
Wed, 24 Sep 2014 20:00:18 +0000 (15:00 -0500)
committerNitin Garg <nitin.garg@freescale.com>
Fri, 16 Jan 2015 03:18:02 +0000 (21:18 -0600)
new dts file to support gpmi/weim on imx6q sabreauto board.

Signed-off-by: Allen Xu <b45815@freescale.com>
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts [new file with mode: 0644]

index 642ddb1ad20f6d6e76dec3f48541da17d1c01fc4..dc07c2af583a080f566902d83c131547b5da809f 100644 (file)
@@ -170,6 +170,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
        imx6q-phytec-pbab01.dtb \
        imx6q-sabreauto.dtb \
        imx6q-sabreauto-flexcan1.dtb \
+       imx6q-sabreauto-gpmi-weim.dtb \
        imx6q-sabrelite.dtb \
        imx6q-sabresd.dtb \
        imx6q-sabresd-ldo.dtb \
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 (file)
index 0000000..1777e7a
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2014 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";
+};
+
+&flexcan2 {
+       /* max7310_c on i2c3 is gone */
+       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 = "okay";
+       dr_mode = "peripheral";
+};
+
+&weim {
+       pinctrl-assert-gpios = <&gpio5 4 GPIO_ACTIVE_LOW>;
+       status = "okay";
+};