commit 5314ec8e52263b56edd6a37d089b3b675d50e3f1
author Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Thu Jul 05 16:56:09 2012 +0800
committer Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Sat Oct 13 09:21:43 2012 +0800
tree 96763a71d0c73d0c88076c85e28f680a8775a69a
parent 6732ae5cb47c4f9a72727585956f2a5e069d1637

arm: at91: dt: at91sam9 add pinctrl support

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

arch/arm/mach-at91/setup.c

diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index e228d73..523daa9 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -449,7 +449,8 @@
 	/* Register the processor-specific clocks */
 	at91_boot_soc.register_clocks();
 
-	at91_boot_soc.init();
+	if (at91_boot_soc.init)
+		at91_boot_soc.init();
 }
 #endif