diff options
-rw-r--r-- | drivers/spi/spi-orion.c | 5 | ||||
-rw-r--r-- | include/linux/spi/orion_spi.h | 1 |
2 files changed, 0 insertions, 6 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) | |||
359 | 359 | ||
360 | orion_spi = spi_master_get_devdata(spi->master); | 360 | orion_spi = spi_master_get_devdata(spi->master); |
361 | 361 | ||
362 | /* Fix ac timing if required. */ | ||
363 | if (orion_spi->spi_info->enable_clock_fix) | ||
364 | orion_spi_setbits(orion_spi, ORION_SPI_IF_CONFIG_REG, | ||
365 | (1 << 14)); | ||
366 | |||
367 | if ((spi->max_speed_hz == 0) | 362 | if ((spi->max_speed_hz == 0) |
368 | || (spi->max_speed_hz > orion_spi->max_speed)) | 363 | || (spi->max_speed_hz > orion_spi->max_speed)) |
369 | spi->max_speed_hz = orion_spi->max_speed; | 364 | spi->max_speed_hz = orion_spi->max_speed; |
diff --git a/include/linux/spi/orion_spi.h b/include/linux/spi/orion_spi.h index decf6d8c77b7..b4d9fa6f797c 100644 --- a/include/linux/spi/orion_spi.h +++ b/include/linux/spi/orion_spi.h | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | struct orion_spi_info { | 12 | struct orion_spi_info { |
13 | u32 tclk; /* no <linux/clk.h> support yet */ | 13 | u32 tclk; /* no <linux/clk.h> support yet */ |
14 | u32 enable_clock_fix; | ||
15 | }; | 14 | }; |
16 | 15 | ||
17 | 16 | ||