spi: davinci: make chip-slect specific parameters really chip-select specific

Some chip-select specific paramterers like wdelay, parity, usage of
chip-select timers (and the actual timer values) are included in
platform data forcing the same behaviour across all chip-selects.

Create a new davinci_spi_config data structure which can be passed
along using controller_data member of spi_device data structure
on a per-device basis.

Signed-off-by: Brian Niebuhr <bniebuhr@efjohnson.com>
Tested-By: Michael Williamson <michael.williamson@criticallink.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/arch/arm/mach-davinci/include/mach/spi.h b/arch/arm/mach-davinci/include/mach/spi.h
index fe699140269c..29c19c425b02 100644
--- a/arch/arm/mach-davinci/include/mach/spi.h
+++ b/arch/arm/mach-davinci/include/mach/spi.h
@@ -29,17 +29,20 @@ enum {
 struct davinci_spi_platform_data {
         u8      version;
         u8      num_chipselect;
-        u8      wdelay;
-        u8      odd_parity;
-        u8      parity_enable;
-        u8      timer_disable;
         u8      clk_internal;
         u8      intr_level;
         u8      poll_mode;
         u8      use_dma;
+        u8      *chip_sel;
+};
+
+struct davinci_spi_config {
+        u8      wdelay;
+        u8      odd_parity;
+        u8      parity_enable;
+        u8      timer_disable;
         u8      c2tdelay;
         u8      t2cdelay;
-        u8      *chip_sel;
 };
 
 #endif  /* __ARCH_ARM_DAVINCI_SPI_H */