diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-11 22:08:54 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-11 22:08:54 (GMT) |
| commit | 68a595c7754d22bfe741a27c7df0965160df575d (patch) | |
| tree | 910d79a3270b48a995a7e19050da95b9999ea4c5 /drivers | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
| parent | 8543d0e72d4340001d756bd89bee70ce239e1ea5 (diff) | |
| download | linux-68a595c7754d22bfe741a27c7df0965160df575d.tar.xz | |
Merge remote-tracking branch 'spi/fix/img-spfi' into spi-linus
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi-img-spfi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c index e649bc7..7d18bec 100644 --- a/drivers/spi/spi-img-spfi.c +++ b/drivers/spi/spi-img-spfi.c @@ -405,10 +405,10 @@ static void img_spfi_config(struct spi_master *master, struct spi_device *spi, /* * output = spfi_clk * (BITCLK / 512), where BITCLK must be a - * power of 2 up to 256 (where 255 == 256 since BITCLK is 8 bits) + * power of 2 up to 128 */ - div = DIV_ROUND_UP(master->max_speed_hz, xfer->speed_hz); - div = clamp(512 / (1 << get_count_order(div)), 1, 255); + div = DIV_ROUND_UP(clk_get_rate(spfi->spfi_clk), xfer->speed_hz); + div = clamp(512 / (1 << get_count_order(div)), 1, 128); val = spfi_readl(spfi, SPFI_DEVICE_PARAMETER(spi->chip_select)); val &= ~(SPFI_DEVICE_PARAMETER_BITCLK_MASK << @@ -594,8 +594,8 @@ static int img_spfi_probe(struct platform_device *pdev) master->num_chipselect = 5; master->dev.of_node = pdev->dev.of_node; master->bits_per_word_mask = SPI_BPW_MASK(32) | SPI_BPW_MASK(8); - master->max_speed_hz = clk_get_rate(spfi->spfi_clk); - master->min_speed_hz = master->max_speed_hz / 512; + master->max_speed_hz = clk_get_rate(spfi->spfi_clk) / 4; + master->min_speed_hz = clk_get_rate(spfi->spfi_clk) / 512; master->set_cs = img_spfi_set_cs; master->transfer_one = img_spfi_transfer_one; |