diff options
| author | Han Xu <b45815@freescale.com> | 2015-05-28 16:42:24 -0500 |
|---|---|---|
| committer | Han Xu <b45815@freescale.com> | 2015-05-29 00:20:59 -0500 |
| commit | a0a2e6426a9055d02dff1e0996cd6c050044e6b7 (patch) | |
| tree | 81697303ff0c04c16496da006b20e7d82c9306f5 /arch/arm/boot/dts/Makefile | |
| parent | 0c33038319b71464dae0d894902e6e6da4dd42a9 (diff) | |
MLK-10984: ARM: dts: add new dts to support NAND on iMX6UL ARM2
add a new dts to support NAND on i.MX6UL ARM2 board, which is conflict
with QSPI and SD2. Also change the hog setting to solve the pin
conflict.
Signed-off-by: Han Xu <b45815@freescale.com>
Signed-off-by: Jason Liu <r64343@freescale.com>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 4500f5f4102b..f530eac89ce1 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -210,6 +210,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6sx-sdb-lcdif1.dtb \ imx6ul-14x14-ddr3-arm2.dtb \ imx6ul-14x14-ddr3-arm2-flexcan2.dtb \ + imx6ul-14x14-ddr3-arm2-gpmi-weim.dtb \ imx6ul-14x14-ddr3-arm2-lcdif.dtb \ imx6ul-14x14-ddr3-arm2-mqs.dtb \ imx6ul-14x14-ddr3-arm2-spdif.dtb \ |