spi: davinci: remove non-useful "clk_internal" platform data

The "clk_internal" platform data member which contols the
CLKMOD bit in Global Control Register 1 is not useful
since CLKMOD needs be set to 1 *always* to ensure master
mode operation.

Remove this platform data.

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

4 files changed, 1 insertions, 11 deletions

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 27ee870b2d27..c0c501a4c139 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -412,7 +412,6 @@ static struct resource dm355_spi0_resources[] = {
 static struct davinci_spi_platform_data dm355_spi0_pdata = {
         .version        = SPI_VERSION_1,
         .num_chipselect = 2,
-        .clk_internal   = 1,
         .cshold_bug     = true,
 };
 static struct platform_device dm355_spi0_device = {
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 1e5012e196ba..8b8204fa7578 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -625,7 +625,6 @@ static u64 dm365_spi0_dma_mask = DMA_BIT_MASK(32);
 static struct davinci_spi_platform_data dm365_spi0_pdata = {
         .version        = SPI_VERSION_1,
         .num_chipselect = 2,
-        .clk_internal   = 1,
 };
 
 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 b3ab7d04943a..1f8b7866bea3 100644
--- a/arch/arm/mach-davinci/include/mach/spi.h
+++ b/arch/arm/mach-davinci/include/mach/spi.h
@@ -29,7 +29,6 @@ enum {
 struct davinci_spi_platform_data {
         u8      version;
         u8      num_chipselect;
-        u8      clk_internal;
         u8      intr_line;
         u8      *chip_sel;
         bool    cshold_bug;
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 5fe298099a1a..2e74fcd2f423 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -927,14 +927,6 @@ static int davinci_spi_probe(struct platform_device *pdev)
                 }
         }
 
-        /* Clock internal */
-        if (davinci_spi->pdata->clk_internal)
-                set_io_bits(davinci_spi->base + SPIGCR1,
-                                SPIGCR1_CLKMOD_MASK);
-        else
-                clear_io_bits(davinci_spi->base + SPIGCR1,
-                                SPIGCR1_CLKMOD_MASK);
-
         if (pdata->intr_line)
                 iowrite32(SPI_INTLVL_1, davinci_spi->base + SPILVL);
         else
@@ -943,6 +935,7 @@ static int davinci_spi_probe(struct platform_device *pdev)
         iowrite32(CS_DEFAULT, davinci_spi->base + SPIDEF);
 
         /* master mode default */
+        set_io_bits(davinci_spi->base + SPIGCR1, SPIGCR1_CLKMOD_MASK);
         set_io_bits(davinci_spi->base + SPIGCR1, SPIGCR1_MASTER_MASK);
 
         ret = spi_bitbang_start(&davinci_spi->bitbang);