[S390] Update default configuration.

[safe/jmp/linux-2.6] / arch / powerpc / sysdev / fsl_soc.c

diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index be5e0bd..3ace747 100644 (file)
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -1222,8 +1222,12 @@ 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;
 
        sysclk = of_get_property(np, "bus-frequency", NULL);