Merge branch 'kirkwood_dt_for_3.4_v3' of git://git.infradead.org/users/jcooper/linux-kirkwood into kirkwood/dt

* 'kirkwood_dt_for_3.4_v3' of git://git.infradead.org/users/jcooper/linux-kirkwood:
  ARM: kirkwood: use devicetree for rtc-mv
  ARM: kirkwood: rtc-mv devicetree bindings
  ARM: kirkwood: fdt: define uart[01] as disabled, enable uart0
  ARM: kirkwood: fdt: facilitate new boards during fdt migration
  ARM: kirkwood: fdt: absorb kirkwood_init()
  ARM: kirkwood: fdt: use mrvl ticker symbol
  ARM: orion: wdt: use resource vice direct access
  ARM: Kirkwood: Remove tclk from kirkwood_asoc_platform_data.
  ARM: orion: spi: remove enable_clock_fix which is not used

1 files changed, 0 insertions, 5 deletions

diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index 13448c832c44..e496f799b7a9 100644
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -359,11 +359,6 @@ static int orion_spi_setup(struct spi_device *spi)
 
         orion_spi = spi_master_get_devdata(spi->master);
 
-        /* Fix ac timing if required.   */
-        if (orion_spi->spi_info->enable_clock_fix)
-                orion_spi_setbits(orion_spi, ORION_SPI_IF_CONFIG_REG,
-                                  (1 << 14));
-
         if ((spi->max_speed_hz == 0)
                         || (spi->max_speed_hz > orion_spi->max_speed))
                 spi->max_speed_hz = orion_spi->max_speed;