---

yaml --- r: 67521 b: refs/heads/master c: 082ea86 h: refs/heads/master i: 67519: 74b5d4f v: v3
git-mirror · Oct 8, 2007 · b3661ab · b3661ab
1 parent f2efd68
commit b3661ab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 803dedb60849a8e4ec38e66ca41f51188c18a87d
+refs/heads/master: 082ea86fce463f8c2f1ce059cc959f21dc1ef24a
diff --git a/trunk/arch/powerpc/sysdev/fsl_soc.c b/trunk/arch/powerpc/sysdev/fsl_soc.c
@@ -1222,7 +1222,11 @@ int __init fsl_spi_init(struct spi_board_info *board_infos,
 	unsigned int i;
 	const u32 *sysclk;
 
+	/* SPI controller is either clocked from QE or SoC clock */
 	np = of_find_node_by_type(NULL, "qe");
+	if (!np)
+		np = of_find_node_by_type(NULL, "soc");
+
 	if (!np)
 		return -ENODEV;