[U-Boot] [PATCH v2 2/7] da850evm : enable NAND even when not in NAND boot mode

Ben Gardiner bengardiner at nanometrics.ca
Thu Oct 14 23:14:29 CEST 2010


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 at nanometrics.ca>
CC: Nick Thompson <nick.thompson at ge.com>
To: Sudhakar Rajashekhara <sudhakar.raj at ti.com>

---

V2:
 * Rebased to b69b02b92f59330be9d662110e202cfd3503eafa of u-boot-ti/master

Note: there is precendent for NAND configuration by u-boot independent of the
selected boot mode; see commit 26be2c53d671ecfd3e0483f0870649ac28322293 by
Nick Thompson <nick.thompson at ge.com> "Davinci: NAND enable ECC even when not in
NAND boot mode"

---
 board/davinci/da8xxevm/da850evm.c |   22 ++++++++++++++++++++++
 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[] = {
-- 
1.7.0.4



More information about the U-Boot mailing list