Commit ede2738a authored by Stephen Warren's avatar Stephen Warren Committed by Grant Likely

spi/tegra-slink: remove redundant code

There is no code to set spi->controller_data, and hence the HW CS logic
can never trigger. Remove the unused code.
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 76a7498f
...@@ -189,7 +189,6 @@ struct tegra_slink_data { ...@@ -189,7 +189,6 @@ struct tegra_slink_data {
unsigned dma_buf_size; unsigned dma_buf_size;
unsigned max_buf_size; unsigned max_buf_size;
bool is_curr_dma_xfer; bool is_curr_dma_xfer;
bool is_hw_based_cs;
struct completion rx_dma_complete; struct completion rx_dma_complete;
struct completion tx_dma_complete; struct completion tx_dma_complete;
...@@ -717,7 +716,6 @@ static int tegra_slink_start_transfer_one(struct spi_device *spi, ...@@ -717,7 +716,6 @@ static int tegra_slink_start_transfer_one(struct spi_device *spi,
u8 bits_per_word; u8 bits_per_word;
unsigned total_fifo_words; unsigned total_fifo_words;
int ret; int ret;
struct tegra_spi_device_controller_data *cdata = spi->controller_data;
unsigned long command; unsigned long command;
unsigned long command2; unsigned long command2;
...@@ -740,39 +738,11 @@ static int tegra_slink_start_transfer_one(struct spi_device *spi, ...@@ -740,39 +738,11 @@ static int tegra_slink_start_transfer_one(struct spi_device *spi,
command = tspi->def_command_reg; command = tspi->def_command_reg;
command |= SLINK_BIT_LENGTH(bits_per_word - 1); command |= SLINK_BIT_LENGTH(bits_per_word - 1);
command |= SLINK_CS_SW | SLINK_CS_VALUE;
command2 = tspi->def_command2_reg; command2 = tspi->def_command2_reg;
command2 |= SLINK_SS_EN_CS(spi->chip_select); command2 |= SLINK_SS_EN_CS(spi->chip_select);
/* possibly use the hw based chip select */
tspi->is_hw_based_cs = false;
if (cdata && cdata->is_hw_based_cs && is_single_xfer &&
((tspi->curr_dma_words * tspi->bytes_per_word) ==
(t->len - tspi->cur_pos))) {
int setup_count;
int sts2;
setup_count = cdata->cs_setup_clk_count >> 1;
setup_count = max(setup_count, 3);
command2 |= SLINK_SS_SETUP(setup_count);
if (tspi->chip_data->cs_hold_time) {
int hold_count;
hold_count = cdata->cs_hold_clk_count;
hold_count = max(hold_count, 0xF);
sts2 = tegra_slink_readl(tspi, SLINK_STATUS2);
sts2 &= ~SLINK_SS_HOLD_TIME(0xF);
sts2 |= SLINK_SS_HOLD_TIME(hold_count);
tegra_slink_writel(tspi, sts2, SLINK_STATUS2);
}
tspi->is_hw_based_cs = true;
}
if (tspi->is_hw_based_cs)
command &= ~SLINK_CS_SW;
else
command |= SLINK_CS_SW | SLINK_CS_VALUE;
command &= ~SLINK_MODES; command &= ~SLINK_MODES;
if (spi->mode & SPI_CPHA) if (spi->mode & SPI_CPHA)
command |= SLINK_CK_SDA; command |= SLINK_CK_SDA;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment