5 files changed, 85 insertions, 11 deletions

diff --git a/include/linux/spi/ds1305.h b/include/linux/spi/ds1305.h
new file mode 100644
index 000000000000..287ec830eab7
--- /dev/null
+++ b/include/linux/spi/ds1305.h
@@ -0,0 +1,35 @@
+#ifndef __LINUX_SPI_DS1305_H
+#define __LINUX_SPI_DS1305_H
+
+/*
+ * One-time configuration for ds1305 and ds1306 RTC chips.
+ *
+ * Put a pointer to this in spi_board_info.platform_data if you want to
+ * be sure that Linux (re)initializes this as needed ... after losing
+ * backup power, and potentially on the first boot.
+ */
+struct ds1305_platform_data {
+
+        /* Trickle charge configuration:  it's OK to leave out the MAGIC
+         * bitmask; mask in either DS1 or DS2, and then one of 2K/4k/8K.
+         */
+#define DS1305_TRICKLE_MAGIC    0xa0
+#define DS1305_TRICKLE_DS2      0x08    /* two diodes */
+#define DS1305_TRICKLE_DS1      0x04    /* one diode */
+#define DS1305_TRICKLE_2K       0x01    /* 2 KOhm resistance */
+#define DS1305_TRICKLE_4K       0x02    /* 4 KOhm resistance */
+#define DS1305_TRICKLE_8K       0x03    /* 8 KOhm resistance */
+        u8      trickle;
+
+        /* set only on ds1306 parts */
+        bool    is_ds1306;
+
+        /* ds1306 only:  enable 1 Hz output */
+        bool    en_1hz;
+
+        /* REVISIT:  the driver currently expects nINT0 to be wired
+         * as the alarm IRQ.  ALM1 may also need to be set up ...
+         */
+};
+
+#endif /* __LINUX_SPI_DS1305_H */
diff --git a/include/linux/spi/max7301.h b/include/linux/spi/max7301.h
new file mode 100644
index 000000000000..6dfd83f19b4b
--- /dev/null
+++ b/include/linux/spi/max7301.h
@@ -0,0 +1,9 @@
+#ifndef LINUX_SPI_MAX7301_H
+#define LINUX_SPI_MAX7301_H
+
+struct max7301_platform_data {
+        /* number assigned to the first GPIO */
+        unsigned        base;
+};
+
+#endif
diff --git a/include/linux/spi/mcp23s08.h b/include/linux/spi/mcp23s08.h
index 835ddf47d45c..22ef107d7704 100644
--- a/include/linux/spi/mcp23s08.h
+++ b/include/linux/spi/mcp23s08.h
@@ -1,18 +1,25 @@
 
-/* FIXME driver should be able to handle all four slaves that
- * can be hooked up to each chipselect, as well as IRQs...
- */
+/* FIXME driver should be able to handle IRQs...  */
+
+struct mcp23s08_chip_info {
+        bool    is_present;             /* true iff populated */
+        u8      pullups;                /* BIT(x) means enable pullup x */
+};
 
 struct mcp23s08_platform_data {
-        /* four slaves can share one SPI chipselect */
-        u8              slave;
+        /* Four slaves (numbered 0..3) can share one SPI chipselect, and
+         * will provide 8..32 GPIOs using 1..4 gpio_chip instances.
+         */
+        struct mcp23s08_chip_info       chip[4];
 
-        /* number assigned to the first GPIO */
+        /* "base" is the number of the first GPIO.  Dynamic assignment is
+         * not currently supported, and even if there are gaps in chip
+         * addressing the GPIO numbers are sequential .. so for example
+         * if only slaves 0 and 3 are present, their GPIOs range from
+         * base to base+15.
+         */
         unsigned        base;
 
-        /* pins with pullups */
-        u8              pullups;
-
         void            *context;       /* param to setup/teardown */
 
         int             (*setup)(struct spi_device *spi,
diff --git a/include/linux/spi/mmc_spi.h b/include/linux/spi/mmc_spi.h
index e9bbe3ebd721..a3626aedaec9 100644
--- a/include/linux/spi/mmc_spi.h
+++ b/include/linux/spi/mmc_spi.h
@@ -1,6 +1,8 @@
 #ifndef __LINUX_SPI_MMC_SPI_H
 #define __LINUX_SPI_MMC_SPI_H
 
+#include <linux/interrupt.h>
+
 struct device;
 struct mmc_host;
 
@@ -21,6 +23,15 @@ struct mmc_spi_platform_data {
         /* sense switch on sd cards */
         int (*get_ro)(struct device *);
 
+        /*
+         * If board does not use CD interrupts, driver can optimize polling
+         * using this function.
+         */
+        int (*get_cd)(struct device *);
+
+        /* Capabilities to pass into mmc core (e.g. MMC_CAP_NEEDS_POLL). */
+        unsigned long caps;
+
         /* how long to debounce card detect, in msecs */
         u16 detect_delay;
 
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 387e428f1cdf..4be01bb44377 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -82,7 +82,7 @@ struct spi_device {
         int                     irq;
         void                    *controller_state;
         void                    *controller_data;
-        const char              *modalias;
+        char                    modalias[32];
 
         /*
          * likely need more hooks for more protocol options affecting how
@@ -733,7 +733,7 @@ struct spi_board_info {
          * controller_data goes to spi_device.controller_data,
          * irq is copied too
          */
-        char            modalias[KOBJ_NAME_LEN];
+        char            modalias[32];
         const void      *platform_data;
         void            *controller_data;
         int             irq;
@@ -778,8 +778,20 @@ spi_register_board_info(struct spi_board_info const *info, unsigned n)
  * use spi_new_device() to describe each device.  You can also call
  * spi_unregister_device() to start making that device vanish, but
  * normally that would be handled by spi_unregister_master().
+ *
+ * You can also use spi_alloc_device() and spi_add_device() to use a two
+ * stage registration sequence for each spi_device.  This gives the caller
+ * some more control over the spi_device structure before it is registered,
+ * but requires that caller to initialize fields that would otherwise
+ * be defined using the board info.
  */
 extern struct spi_device *
+spi_alloc_device(struct spi_master *master);
+
+extern int
+spi_add_device(struct spi_device *spi);
+
+extern struct spi_device *
 spi_new_device(struct spi_master *, struct spi_board_info *);
 
 static inline void