diff options
author | Brian Niebuhr <bniebuhr@efjohnson.com> | 2010-08-13 00:41:03 -0400 |
---|---|---|
committer | Sekhar Nori <nsekhar@ti.com> | 2010-11-18 08:08:24 -0500 |
commit | 7978b8c385a86f0b5b9304e81a1dfb5dcaf21528 (patch) | |
tree | ff13c4dd8d8cd570d57d50f072e8cdab3c97ea5f /arch/arm | |
parent | 843a713bc53d04f8fac46ddd8693a2cc0422ca5e (diff) |
spi: davinci: enable both activation and deactivation of chip-selects
Let davinci_spi_chipselect() perform both activation and
deactivation of chip selects. This lets spi_bitbang fully
control chip select activation, as intended by the SPI API.
With this change, the chip select activation code need not
be duplicated in davinci_spi_bufs_{pio|dma}().
Also, keeping chip select active control is removed as a
platform data and simply controlled using information from
spi_bitbang on whether chip slect should be activated or
de-activated.
Signed-off-by: Brian Niebuhr <bniebuhr@efjohnson.com>
Tested-By: Michael Williamson <michael.williamson@criticallink.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-davinci/dm355.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-davinci/dm365.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/spi.h | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index 9be261beae7d..6a76dfa60ef7 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c | |||
@@ -413,7 +413,6 @@ static struct davinci_spi_platform_data dm355_spi0_pdata = { | |||
413 | .version = SPI_VERSION_1, | 413 | .version = SPI_VERSION_1, |
414 | .num_chipselect = 2, | 414 | .num_chipselect = 2, |
415 | .clk_internal = 1, | 415 | .clk_internal = 1, |
416 | .cs_hold = 1, | ||
417 | .intr_level = 0, | 416 | .intr_level = 0, |
418 | .poll_mode = 1, /* 0 -> interrupt mode 1-> polling mode */ | 417 | .poll_mode = 1, /* 0 -> interrupt mode 1-> polling mode */ |
419 | .c2tdelay = 0, | 418 | .c2tdelay = 0, |
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index a12065e87266..cd623db8d7d7 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c | |||
@@ -626,7 +626,6 @@ static struct davinci_spi_platform_data dm365_spi0_pdata = { | |||
626 | .version = SPI_VERSION_1, | 626 | .version = SPI_VERSION_1, |
627 | .num_chipselect = 2, | 627 | .num_chipselect = 2, |
628 | .clk_internal = 1, | 628 | .clk_internal = 1, |
629 | .cs_hold = 1, | ||
630 | .intr_level = 0, | 629 | .intr_level = 0, |
631 | .poll_mode = 1, /* 0 -> interrupt mode 1-> polling mode */ | 630 | .poll_mode = 1, /* 0 -> interrupt mode 1-> polling mode */ |
632 | .c2tdelay = 0, | 631 | .c2tdelay = 0, |
diff --git a/arch/arm/mach-davinci/include/mach/spi.h b/arch/arm/mach-davinci/include/mach/spi.h index 910efbf099c0..2cb326e536bb 100644 --- a/arch/arm/mach-davinci/include/mach/spi.h +++ b/arch/arm/mach-davinci/include/mach/spi.h | |||
@@ -33,7 +33,6 @@ struct davinci_spi_platform_data { | |||
33 | u8 wait_enable; | 33 | u8 wait_enable; |
34 | u8 timer_disable; | 34 | u8 timer_disable; |
35 | u8 clk_internal; | 35 | u8 clk_internal; |
36 | u8 cs_hold; | ||
37 | u8 intr_level; | 36 | u8 intr_level; |
38 | u8 poll_mode; | 37 | u8 poll_mode; |
39 | u8 use_dma; | 38 | u8 use_dma; |