diff options
| author | Han Xu <b45815@freescale.com> | 2015-03-12 18:11:52 -0500 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@nxp.com> | 2016-01-14 11:02:36 -0600 |
| commit | 4a5ff4255d073cd5dc174691e47a6c6c5461eef3 (patch) | |
| tree | 12dcfef6b7247009b2ee5cbcc63a564b4701c8d7 /arch/arm/boot | |
| parent | cba68558024cf28fdd3ae4d3c3cf46c507807582 (diff) | |
MLK-10483: ARM: dts: add gpmi weim support for imx6qp
dts for gpmi nand and weim nor support for imx6qp sabreauto
Signed-off-by: Han Xu <b45815@freescale.com>
(cherry picked and merge from commit adb9c42a8be0bd148069540b089d2e762bec05e9)
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qp-sabreauto-gpmi-weim.dts | 52 |
2 files changed, 53 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index ae432454c39e..7702a28aa16a 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -303,6 +303,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6q-sabreauto-ecspi.dtb \ imx6q-sabreauto-gpmi-weim.dtb \ imx6qp-sabreauto.dtb \ + imx6qp-sabreauto-gpmi-weim.dtb \ imx6qp-sabresd.dtb \ imx6qp-sabresd-btwifi.dtb \ imx6q-sabrelite.dtb \ diff --git a/arch/arm/boot/dts/imx6qp-sabreauto-gpmi-weim.dts b/arch/arm/boot/dts/imx6qp-sabreauto-gpmi-weim.dts new file mode 100644 index 000000000000..9830f790d1d1 --- /dev/null +++ b/arch/arm/boot/dts/imx6qp-sabreauto-gpmi-weim.dts @@ -0,0 +1,52 @@ +/* + * 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 { + /* pin conflict with weim */ + status = "disabled"; +}; + +/* remove #if 0 after flexcan is ready */ +#if 0 +&flexcan2 { + /* max7310_c on i2c3 is gone */ + status = "disabled"; +}; +#endif + +&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"; +}; |