[linux-yocto] [PATCH 129/161] arch/powerpc: Don't Try to Use NAND on Axxia 3500

[Cristian Bercaru]

From: John Jacques <john.jacques at lsi.com>

If NAND is enabled and the board is 3500 then
gracefully exit with the error message

NAND not compatible with 3500

Signed-off-by: John Jacques <john.jacques at lsi.com>
---
 drivers/mtd/nand/lsi_acp_nand.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/lsi_acp_nand.c b/drivers/mtd/nand/lsi_acp_nand.c
index c3165d9..1cac342 100644
--- a/drivers/mtd/nand/lsi_acp_nand.c
+++ b/drivers/mtd/nand/lsi_acp_nand.c
@@ -3471,6 +3471,13 @@ lsi_nand_init(void)
 	static const char *part_probe_types[]
 	= { "cmdlinepart", "ofpart", NULL };
 
+	np = of_find_compatible_node(NULL, NULL, "lsi,acp3500");
+
+	if (NULL != np) {
+		printk(KERN_ERR "NAND Support is Not Yet Available on 3500\n");
+		return -1;
+	}
+
 	memset(&ppdata, 0, sizeof(ppdata));
 
 	np = of_find_node_by_type(np, "nand");
@@ -3490,7 +3497,7 @@ lsi_nand_init(void)
 		enabled = of_get_property(np, "enabled", NULL);
 
 		if (!enabled || (enabled && (0 == *enabled))) {
-			printk("ACP NAND Controller Isn't Enabled.\n");
+			printk(KERN_INFO "ACP NAND Controller Isn't Enabled.\n");
 			return -ENODEV;
 		}
 
-- 
1.7.9.5