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;