From 7e0aa6dadeb135cbbbaaaaeffe54e93090ed3b01 Mon Sep 17 00:00:00 2001 From: Allen Xu Date: Wed, 3 Dec 2014 03:23:39 +0800 Subject: [PATCH] MLK-9943 ARM: dts: add new dts for nand support for 19x19 arm2 Add new dts file to support NAND for imx6sx 19x19 arm2 board. Signed-off-by: Allen Xu (cherry picked and merge from commit bdc522d1773156f03b74d4711a60f81824184b40) --- arch/arm/boot/dts/Makefile | 3 ++- .../boot/dts/imx6sx-19x19-arm2-gpmi-weim.dts | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/imx6sx-19x19-arm2-gpmi-weim.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 5a3cdecf2a33..e00fd713e8ff 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -439,7 +439,8 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ imx6sx-sdb-sai.dtb \ imx6sx-19x19-arm2.dtb \ imx6sx-19x19-arm2-ldo.dtb \ - imx6sx-19x19-arm2-csi.dtb + imx6sx-19x19-arm2-csi.dtb \ + imx6sx-19x19-arm2-gpmi-weim.dtb dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ul-14x14-evk.dtb \ imx6ul-14x14-evk-btwifi.dtb \ diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2-gpmi-weim.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2-gpmi-weim.dts new file mode 100644 index 000000000000..88d1cdb0d5f4 --- /dev/null +++ b/arch/arm/boot/dts/imx6sx-19x19-arm2-gpmi-weim.dts @@ -0,0 +1,19 @@ +/* + * 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 "imx6sx-19x19-arm2.dts" + +&qspi2 { + status = "disabled"; +}; + +&gpmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpmi_nand_1>; + status = "okay"; /* pin conflict with qspi*/ +}; -- 2.17.1