spi_mpc83xx: rework chip selects handling

[linux-2.6-omap-h63xx.git] / arch / powerpc / sysdev / fsl_soc.c

diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 115cb16351fd97b3dfcac78fca07634f0f0ba8eb..a46c1c8679309ff80158266981a6379acd856b30 100644 (file)
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -22,6 +22,7 @@
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/phy.h>
 #include <linux/phy_fixed.h>
@@ -328,6 +329,9 @@ static int __init fsl_usb_of_init(void)
                struct fsl_usb2_platform_data usb_data;
                const unsigned char *prop = NULL;
 
+               if (!of_device_is_available(np))
+                       continue;
+
                memset(&r, 0, sizeof(r));
                memset(&usb_data, 0, sizeof(usb_data));
 
@@ -416,8 +420,8 @@ arch_initcall(fsl_usb_of_init);
 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))
+                                  void (*cs_control)(struct spi_device *dev,
+                                                     bool on))
 {
        struct device_node *np;
        unsigned int i = 0;
@@ -429,8 +433,7 @@ static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk,
                struct resource res[2];
                struct platform_device *pdev;
                struct fsl_spi_platform_data pdata = {
-                       .activate_cs = activate_cs,
-                       .deactivate_cs = deactivate_cs,
+                       .cs_control = cs_control,
                };
 
                memset(res, 0, sizeof(res));
@@ -497,8 +500,7 @@ next:
 
 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))
+                       void (*cs_control)(struct spi_device *spi, bool on))
 {
        u32 sysclk = -1;
        int ret;
@@ -514,10 +516,10 @@ int __init fsl_spi_init(struct spi_board_info *board_infos,
        }
 
        ret = of_fsl_spi_probe(NULL, "fsl,spi", sysclk, board_infos,
-                              num_board_infos, activate_cs, deactivate_cs);
+                              num_board_infos, cs_control);
        if (!ret)
                of_fsl_spi_probe("spi", "fsl_spi", sysclk, board_infos,
-                                num_board_infos, activate_cs, deactivate_cs);
+                                num_board_infos, cs_control);
 
        return spi_register_board_info(board_infos, num_board_infos);
 }