From b3661ab2f346fc2a1480999be94224c0da9fd1d8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 6 Oct 2007 22:06:40 +0200 Subject: [PATCH] --- yaml --- r: 67521 b: refs/heads/master c: 082ea86fce463f8c2f1ce059cc959f21dc1ef24a h: refs/heads/master i: 67519: 74b5d4fd3f490132a933b5f253f797b195e4829c v: v3 --- [refs] | 2 +- trunk/arch/powerpc/sysdev/fsl_soc.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a1a057dc700d..92c208942a9c 100644 --- 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 index be5e0bda2318..3ace7474809e 100644 --- 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;