13 files changed, 92 insertions, 66 deletions

diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index 9bcf2c92541f..20a03f5b5bb7 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -130,8 +130,8 @@
                 };
 
                 spi@7000 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
                         reg = <7000 1000>;
                         interrupts = <10 8>;
                         interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 1bb75ef389ff..15bb3459ff8a 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -223,8 +223,8 @@
                 };
 
                 spi@4c0 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
                         reg = <4c0 40>;
                         interrupts = <2>;
                         interrupt-parent = < &qeic >;
@@ -232,8 +232,8 @@
                 };
 
                 spi@500 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
+                        cell-index = <1>;
+                        compatible = "fsl,spi";
                         reg = <500 40>;
                         interrupts = <1>;
                         interrupt-parent = < &qeic >;
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index f6a86336c8e0..f086fac59219 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -184,8 +184,8 @@
                 };
 
                 spi@4c0 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
                         reg = <4c0 40>;
                         interrupts = <2>;
                         interrupt-parent = <&qeic>;
@@ -193,8 +193,8 @@
                 };
 
                 spi@500 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
+                        cell-index = <1>;
+                        compatible = "fsl,spi";
                         reg = <500 40>;
                         interrupts = <1>;
                         interrupt-parent = <&qeic>;
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index 04b8da4deb60..4a4ddea2d99c 100644
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -82,8 +82,8 @@
                 };
 
                 spi@7000 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
                         reg = <7000 1000>;
                         interrupts = <10 8>;
                         interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index a06ff92cf0b1..79983d74eee4 100644
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -80,8 +80,8 @@
                 };
 
                 spi@7000 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
                         reg = <7000 1000>;
                         interrupts = <10 8>;
                         interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index d2c0e8ab8b7c..8faa8bd6ed64 100644
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -95,8 +95,8 @@
                 };
 
                 spi@7000 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
                         reg = <0x7000 0x1000>;
                         interrupts = <16 8>;
                         interrupt-parent = <&ipic>;
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index fa98bdf0de8c..d3b8262df686 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -225,8 +225,8 @@
                 };
 
                 spi@4c0 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
                         reg = <4c0 40>;
                         interrupts = <2>;
                         interrupt-parent = < &qeic >;
@@ -234,8 +234,8 @@
                 };
 
                 spi@500 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
+                        cell-index = <1>;
+                        compatible = "fsl,spi";
                         reg = <500 40>;
                         interrupts = <1>;
                         interrupt-parent = < &qeic >;
diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts
index 98b46065f45a..3b9611f189e1 100644
--- a/arch/powerpc/boot/dts/mpc8377_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8377_mds.dts
@@ -83,7 +83,8 @@
                 };
 
                 spi@7000 {
-                        compatible = "fsl_spi";
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
                         reg = <0x7000 0x1000>;
                         interrupts = <0x10 0x8>;
                         interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc8378_mds.dts b/arch/powerpc/boot/dts/mpc8378_mds.dts
index c117a6a3a8e6..386f4a037b33 100644
--- a/arch/powerpc/boot/dts/mpc8378_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8378_mds.dts
@@ -83,7 +83,8 @@
                 };
 
                 spi@7000 {
-                        compatible = "fsl_spi";
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
                         reg = <0x7000 0x1000>;
                         interrupts = <0x10 0x8>;
                         interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts
index fc3ba79fb684..da9931b6c5c0 100644
--- a/arch/powerpc/boot/dts/mpc8379_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8379_mds.dts
@@ -83,7 +83,8 @@
                 };
 
                 spi@7000 {
-                        compatible = "fsl_spi";
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
                         reg = <0x7000 0x1000>;
                         interrupts = <0x10 0x8>;
                         interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index 692d5bd81e70..c929fba7f399 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -302,8 +302,8 @@
                 };
 
                 spi@4c0 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
                         reg = <4c0 40>;
                         interrupts = <2>;
                         interrupt-parent = <&qeic>;
@@ -311,8 +311,8 @@
                 };
 
                 spi@500 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
+                        cell-index = <1>;
+                        compatible = "fsl,spi";
                         reg = <500 40>;
                         interrupts = <1>;
                         interrupt-parent = <&qeic>;
diff --git a/arch/powerpc/boot/dts/sbc8349.dts b/arch/powerpc/boot/dts/sbc8349.dts
index 9c13c1a99640..0934f54b2b43 100644
--- a/arch/powerpc/boot/dts/sbc8349.dts
+++ b/arch/powerpc/boot/dts/sbc8349.dts
@@ -87,7 +87,8 @@
                 };
 
                 spi@7000 {
-                        compatible = "fsl_spi";
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
                         reg = <0x7000 0x1000>;
                         interrupts = <0x10 0x8>;
                         interrupt-parent = <&ipic>;
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 6f81dd5eb6d4..e48b20e934ca 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -1276,44 +1276,17 @@ arch_initcall(cpm_smc_uart_of_init);
 #endif /* CONFIG_8xx */
 #endif /* CONFIG_PPC_CPM_NEW_BINDING */
 
-int __init fsl_spi_init(struct spi_board_info *board_infos,
-                        unsigned int num_board_infos,
-                        void (*activate_cs)(u8 cs, u8 polarity),
-                        void (*deactivate_cs)(u8 cs, u8 polarity))
+static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk,
+                                   struct spi_board_info *board_infos,
+                                   unsigned int num_board_infos,
+                                   void (*activate_cs)(u8 cs, u8 polarity),
+                                   void (*deactivate_cs)(u8 cs, u8 polarity))
 {
         struct device_node *np;
-        unsigned int i;
-        u32 sysclk = -1;
-
-        /* SPI controller is either clocked from QE or SoC clock */
-#ifdef CONFIG_QUICC_ENGINE
-        sysclk = get_brgfreq();
-#endif
-        if (sysclk == -1) {
-                const u32 *freq;
-                int size;
-
-                np = of_find_node_by_type(NULL, "soc");
-                if (!np)
-                        return -ENODEV;
-
-                freq = of_get_property(np, "clock-frequency", &size);
-                if (!freq || size != sizeof(*freq) || *freq == 0) {
-                        freq = of_get_property(np, "bus-frequency", &size);
-                        if (!freq || size != sizeof(*freq) || *freq == 0) {
-                                of_node_put(np);
-                                return -ENODEV;
-                        }
-                }
-
-                sysclk = *freq;
-                of_node_put(np);
-        }
+        unsigned int i = 0;
 
-        for (np = NULL, i = 1;
-             (np = of_find_compatible_node(np, "spi", "fsl_spi")) != NULL;
-             i++) {
-                int ret = 0;
+        for_each_compatible_node(np, type, compatible) {
+                int ret;
                 unsigned int j;
                 const void *prop;
                 struct resource res[2];
@@ -1332,6 +1305,10 @@ int __init fsl_spi_init(struct spi_board_info *board_infos,
                         goto err;
                 pdata.bus_num = *(u32 *)prop;
 
+                prop = of_get_property(np, "cell-index", NULL);
+                if (prop)
+                        i = *(u32 *)prop;
+
                 prop = of_get_property(np, "mode", NULL);
                 if (prop && !strcmp(prop, "cpu-qe"))
                         pdata.qe_mode = 1;
@@ -1342,7 +1319,7 @@ int __init fsl_spi_init(struct spi_board_info *board_infos,
                 }
 
                 if (!pdata.max_chipselect)
-                        goto err;
+                        continue;
 
                 ret = of_address_to_resource(np, 0, &res[0]);
                 if (ret)
@@ -1369,13 +1346,58 @@ int __init fsl_spi_init(struct spi_board_info *board_infos,
                 if (ret)
                         goto unreg;
 
-                continue;
+                goto next;
 unreg:
                 platform_device_del(pdev);
 err:
-                continue;
+                pr_err("%s: registration failed\n", np->full_name);
+next:
+                i++;
         }
 
+        return i;
+}
+
+int __init fsl_spi_init(struct spi_board_info *board_infos,
+                        unsigned int num_board_infos,
+                        void (*activate_cs)(u8 cs, u8 polarity),
+                        void (*deactivate_cs)(u8 cs, u8 polarity))
+{
+        u32 sysclk = -1;
+        int ret;
+
+#ifdef CONFIG_QUICC_ENGINE
+        /* SPI controller is either clocked from QE or SoC clock */
+        sysclk = get_brgfreq();
+#endif
+        if (sysclk == -1) {
+                struct device_node *np;
+                const u32 *freq;
+                int size;
+
+                np = of_find_node_by_type(NULL, "soc");
+                if (!np)
+                        return -ENODEV;
+
+                freq = of_get_property(np, "clock-frequency", &size);
+                if (!freq || size != sizeof(*freq) || *freq == 0) {
+                        freq = of_get_property(np, "bus-frequency", &size);
+                        if (!freq || size != sizeof(*freq) || *freq == 0) {
+                                of_node_put(np);
+                                return -ENODEV;
+                        }
+                }
+
+                sysclk = *freq;
+                of_node_put(np);
+        }
+
+        ret = of_fsl_spi_probe(NULL, "fsl,spi", sysclk, board_infos,
+                               num_board_infos, activate_cs, deactivate_cs);
+        if (!ret)
+                of_fsl_spi_probe("spi", "fsl_spi", sysclk, board_infos,
+                                 num_board_infos, activate_cs, deactivate_cs);
+
         return spi_register_board_info(board_infos, num_board_infos);
 }