summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorBen Gardiner <bengardiner@nanometrics.ca>2010-10-14 17:26:19 -0400
committerWolfgang Denk <wd@denx.de>2010-10-17 20:14:45 +0200
commit756d1fe7ac96822f2125cddde08ccc608bd69a24 (patch)
tree00cff9ef27be5a3f058f9b4f0cc4d37c17cf386f /board
parent10d6ac94e0aa8bbbde45094e988c87ca971e1f10 (diff)
downloadu-boot-imx-756d1fe7ac96822f2125cddde08ccc608bd69a24.zip
u-boot-imx-756d1fe7ac96822f2125cddde08ccc608bd69a24.tar.gz
u-boot-imx-756d1fe7ac96822f2125cddde08ccc608bd69a24.tar.bz2
da850evm : enable NAND even when not in NAND boot mode
There is currently no NAND pinmux enabled by the da850evm board setup code. This is fine when booting from NAND since the early boot code (UBL) will setup the pinmux; however, when the boot mode is any other setting NAND is unusable when enabled in the config. This patch adds a pinmux list for NAND and enables it when NAND is enabled in the config. Tested by booting from SPI on the da850evm and verifying NAND was usable. Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> CC: Nick Thompson <nick.thompson@ge.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Diffstat (limited to 'board')
-rw-r--r--board/davinci/da8xxevm/da850evm.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index eeb456c..f84adb9 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -54,12 +54,34 @@ static const struct pinmux_config i2c_pins[] = {
{ pinmux(4), 2, 3 }
};
+#ifdef CONFIG_NAND_DAVINCI
+const struct pinmux_config nand_pins[] = {
+ { pinmux(7), 1, 1 },
+ { pinmux(7), 1, 2 },
+ { pinmux(7), 1, 4 },
+ { pinmux(7), 1, 5 },
+ { pinmux(9), 1, 0 },
+ { pinmux(9), 1, 1 },
+ { pinmux(9), 1, 2 },
+ { pinmux(9), 1, 3 },
+ { pinmux(9), 1, 4 },
+ { pinmux(9), 1, 5 },
+ { pinmux(9), 1, 6 },
+ { pinmux(9), 1, 7 },
+ { pinmux(12), 1, 5 },
+ { pinmux(12), 1, 6 }
+};
+#endif
+
static const struct pinmux_resource pinmuxes[] = {
#ifdef CONFIG_SPI_FLASH
PINMUX_ITEM(spi1_pins),
#endif
PINMUX_ITEM(uart_pins),
PINMUX_ITEM(i2c_pins),
+#ifdef CONFIG_NAND_DAVINCI
+ PINMUX_ITEM(nand_pins),
+#endif
};
static const struct lpsc_resource lpsc[] = {