From 0df8baddb6adfd0e658b9d962daba9e584c06057 Mon Sep 17 00:00:00 2001 From: Allen Xu Date: Wed, 24 Sep 2014 15:00:18 -0500 Subject: [PATCH] ENGR00333048 ARM: dts: add new dts for gpmi and weim on imx6q sabreauto new dts file to support gpmi/weim on imx6q sabreauto board. Signed-off-by: Allen Xu --- arch/arm/boot/dts/Makefile | 1 + .../boot/dts/imx6q-sabreauto-gpmi-weim.dts | 49 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 642ddb1ad20f..dc07c2af583a 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -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 index 000000000000..1777e7a68edd --- /dev/null +++ b/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts @@ -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"; +}; -- 2.39.2