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>

3 files changed, 8 insertions, 11 deletions

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 6a76dfa60ef7..a6d9b72190ff 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -413,10 +413,7 @@ static struct davinci_spi_platform_data dm355_spi0_pdata = {
         .version        = SPI_VERSION_1,
         .num_chipselect = 2,
         .clk_internal   = 1,
-        .intr_level     = 0,
         .poll_mode      = 1,    /* 0 -> interrupt mode 1-> polling mode */
-        .c2tdelay       = 0,
-        .t2cdelay       = 0,
 };
 static struct platform_device dm355_spi0_device = {
         .name = "spi_davinci",
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index cd623db8d7d7..80dd159134cb 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -626,10 +626,7 @@ static struct davinci_spi_platform_data dm365_spi0_pdata = {
         .version        = SPI_VERSION_1,
         .num_chipselect = 2,
         .clk_internal   = 1,
-        .intr_level     = 0,
         .poll_mode      = 1,    /* 0 -> interrupt mode 1-> polling mode */
-        .c2tdelay       = 0,
-        .t2cdelay       = 0,
 };
 
 static struct resource dm365_spi0_resources[] = {
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 */