summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2011-12-14 11:16:00 -0800
committerGerrit <chrome-bot@google.com>2011-12-19 13:28:31 -0800
commitc4d58d54eb6c147e7558fc6014d51856a03a26dd (patch)
tree28f6ccaba35c461f6b522b9ff048b47cb06852dd /board
parent80867ffc06842d3e75695709837917025cbe2b04 (diff)
tegra: Skip NAND init if fdt indicates it is not active
This allows NAND to be disabled from the fdt easily. BUG=chromium-os:22938 TEST=build and boot on Kaen Signed-off-by: Fred Signed-off-by: John Change-Id: Ibf9259f8621e73fcf943f54a20327513288fef06 Reviewed-on: https://gerrit.chromium.org/gerrit/12913 Reviewed-by: Stefan Reinauer <reinauer@chromium.org> Commit-Ready: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'board')
-rw-r--r--board/nvidia/common/tegra2_nand.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/board/nvidia/common/tegra2_nand.c b/board/nvidia/common/tegra2_nand.c
index 4353bb60bc..d9869cec8f 100644
--- a/board/nvidia/common/tegra2_nand.c
+++ b/board/nvidia/common/tegra2_nand.c
@@ -924,6 +924,8 @@ int board_nand_init(struct nand_chip *nand)
printf("Could not decode nand-flash in device tree\n");
return -1;
}
+ if (!config->enabled)
+ return -1;
info->reg = config->reg;
#else
int gpio;