SPI omap2_mcspi.c: Use the transfer speed_hz value if provided
PATCH 4/6 SPI omap2_mcspi.c: Use the transfer speed_hz value if provided
omap2_mcspi_setup_transfer() gets called if a transfer has a non-zero speed_hz value but it is never used in the function to override the speed.
This patch enables its use.
Signed-off-by Scott Ellis <[email protected]>
drivers/spi/omap2_mcspi.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-)
drivers/spi/omap2_mcspi.c +10 -4
@@ -580,18 +580,24 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi,struct spi_master *spi_cntrl;u32 l =0 , div =0 ;u8 word_len = spi->bits_per_word; +u32 speed_hz = spi->max_speed_hz; mcspi =spi_master_get_devdata (spi->master); spi_cntrl = mcspi->master; -if (t !=NULL && t->bits_per_word) - word_len = t->bits_per_word; +if (t !=NULL ) { +if (t->bits_per_word) + word_len = t->bits_per_word; + +if (t->speed_hz) + speed_hz = t->speed_hz; + } cs->word_len = word_len; -if (spi->max_speed_hz) { +if (speed_hz) {while (div <= mcspi->max_clk_div && - (OMAP2_MCSPI_MAX_FREQ /(1 << div)) > spi->max_speed_hz) + (OMAP2_MCSPI_MAX_FREQ /(1 << div)) > speed_hz) div++; }else { div = mcspi->max_clk_div;
Please ignore this patch.
The changes already in 2.6.34-rc7 are sufficient.
They made it there because I initially submitted to the wrong list.
This patch was expanded from that one to also using the modified clock divider values from patches 2 and 3 of this series which I have found aren't needed.