From 963335029d93a77b89ca73b407a23f710597acc9 Mon Sep 17 00:00:00 2001 From: Leonard Crestez Date: Wed, 28 Feb 2018 17:55:22 +0200 Subject: MLK-11373: ARM: dts: i.MX7d: add gpmi nand support for 7d-sdb board Add gpmi nand support on i.MX7D sdb board. Signed-off-by: Han Xu Signed-off-by: Fugang Duan During 4.14 rebase found that imx7s.dtsi already has a gpmi-nand node added by upstream, preferred that one and skipped the definition in imx7d.dtsi. The definitions differed on clocks. Signed-off-by: Leonard Crestez --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx7d-sdb-gpmi-weim.dts | 25 +++++++++++++++++++++++++ arch/arm/boot/dts/imx7d-sdb.dts | 29 +++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 arch/arm/boot/dts/imx7d-sdb-gpmi-weim.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index bd76ce13933f..b44f7fa7448b 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -535,6 +535,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \ imx7d-sbc-imx7.dtb \ imx7d-sdb.dtb \ imx7d-sdb-epdc.dtb \ + imx7d-sdb-gpmi-weim.dtb \ imx7d-sdb-m4.dtb \ imx7d-sdb-sht11.dtb \ imx7s-colibri-eval-v3.dtb \ diff --git a/arch/arm/boot/dts/imx7d-sdb-gpmi-weim.dts b/arch/arm/boot/dts/imx7d-sdb-gpmi-weim.dts new file mode 100644 index 000000000000..2014f0a976ba --- /dev/null +++ b/arch/arm/boot/dts/imx7d-sdb-gpmi-weim.dts @@ -0,0 +1,25 @@ +/* + * 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 "imx7d-sdb.dts" + +&gpmi{ + status = "okay"; +}; + +&sai1{ + status = "disabled"; +}; + +&usdhc3{ + status = "disabled"; +}; + +&uart5{ + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index 92e86a64823d..32846ea55983 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -750,6 +750,13 @@ fsl,ext-reset-output; }; +&gpmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpmi_nand_1>; + status = "disabled"; + nand-on-flash-bbt; +}; + &iomuxc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hog>; @@ -860,6 +867,28 @@ >; }; + pinctrl_gpmi_nand_1: gpmi-nand-1 { + fsl,pins = < + MX7D_PAD_SD3_CLK__NAND_CLE 0x71 + MX7D_PAD_SD3_CMD__NAND_ALE 0x71 + MX7D_PAD_SAI1_MCLK__NAND_WP_B 0x71 + MX7D_PAD_SAI1_TX_BCLK__NAND_CE0_B 0x71 + MX7D_PAD_SAI1_RX_DATA__NAND_CE1_B 0x71 + MX7D_PAD_SAI1_TX_DATA__NAND_READY_B 0x74 + MX7D_PAD_SD3_STROBE__NAND_RE_B 0x71 + MX7D_PAD_SD3_RESET_B__NAND_WE_B 0x71 + MX7D_PAD_SD3_DATA0__NAND_DATA00 0x71 + MX7D_PAD_SD3_DATA1__NAND_DATA01 0x71 + MX7D_PAD_SD3_DATA2__NAND_DATA02 0x71 + MX7D_PAD_SD3_DATA3__NAND_DATA03 0x71 + MX7D_PAD_SD3_DATA4__NAND_DATA04 0x71 + MX7D_PAD_SD3_DATA5__NAND_DATA05 0x71 + MX7D_PAD_SD3_DATA6__NAND_DATA06 0x71 + MX7D_PAD_SD3_DATA7__NAND_DATA07 0x71 + + >; + }; + pinctrl_i2c1: i2c1grp { fsl,pins = < MX7D_PAD_I2C1_SDA__I2C1_SDA 0x4000007f -- cgit v1.2.3