summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorHan Xu <b45815@freescale.com>2015-03-27 11:23:08 -0500
committerguoyin.chen <guoyin.chen@freescale.com>2015-05-08 17:24:27 +0800
commit7e383d023f7ebb29ea7710c25c18f36e90ad9b9d (patch)
tree8ed48a8cece05c02e06a13a915a16b4935d533d9 /arch/arm
parent2fa329a9ce9a02833a6690d173912c6b5be09beb (diff)
MLK-10497 ARM: dts: supported spi-nor on imx6qp sabreauto
add new dts to support spi-nor on imx6qp sabreauto Signed-off-by: Han Xu <b45815@freescale.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/Makefile1
-rw-r--r--arch/arm/boot/dts/imx6qp-sabreauto-ecspi.dts40
2 files changed, 41 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index e9e16e7cb908..0cc5b0f7b632 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -173,6 +173,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
imx6q-sabreauto-ecspi.dtb \
imx6q-sabreauto-gpmi-weim.dtb \
imx6qp-sabreauto.dtb \
+ imx6qp-sabreauto-ecspi.dtb \
imx6qp-sabreauto-gpmi-weim.dtb\
imx6q-sabrelite.dtb \
imx6q-sabresd.dtb \
diff --git a/arch/arm/boot/dts/imx6qp-sabreauto-ecspi.dts b/arch/arm/boot/dts/imx6qp-sabreauto-ecspi.dts
new file mode 100644
index 000000000000..2f78bcee37e7
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qp-sabreauto-ecspi.dts
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2015 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 "imx6qp-sabreauto.dts"
+
+&ecspi1 {
+ pinctrl-assert-gpios = <&gpio5 4 GPIO_ACTIVE_LOW>;
+ status = "okay";
+};
+
+&flexcan2 {
+ /* max7310_c on i2c3 is gone */
+ status = "disabled";
+};
+
+&i2c3 {
+ /* pin conflict with ecspi1 */
+ status = "disabled";
+};
+
+&uart3 {
+ /* the uart3 depends on the i2c3, so disable it too. */
+ status = "disabled";
+};
+
+&usbh1 {
+ /* max7310_b on i2c3 is gone */
+ status = "disabled";
+};
+
+&usbotg {
+ /* max7310_c on i2c3 is gone */
+ status = "okay";
+ dr_mode = "peripheral";
+};