Skip to content

Commit 9df2003

Browse files
msperlbroonie
authored andcommitted
spi: bcm2835: support effective_speed_hz
Setting spi_transfer->effective_speed_hz in transfer_one so that it can get used in cs_change_delay configured with delay as a muliple of SPI clock cycles. Signed-off-by: Martin Sperl <[email protected]> Signed-off-by: Marc Kleine-Budde <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent badfae4 commit 9df2003

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/spi/spi-bcm2835.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ static int bcm2835_spi_transfer_one(struct spi_controller *ctlr,
10821082
struct spi_transfer *tfr)
10831083
{
10841084
struct bcm2835_spi *bs = spi_controller_get_devdata(ctlr);
1085-
unsigned long spi_hz, clk_hz, cdiv, spi_used_hz;
1085+
unsigned long spi_hz, clk_hz, cdiv;
10861086
unsigned long hz_per_byte, byte_limit;
10871087
u32 cs = bs->prepare_cs[spi->chip_select];
10881088

@@ -1102,7 +1102,7 @@ static int bcm2835_spi_transfer_one(struct spi_controller *ctlr,
11021102
} else {
11031103
cdiv = 0; /* 0 is the slowest we can go */
11041104
}
1105-
spi_used_hz = cdiv ? (clk_hz / cdiv) : (clk_hz / 65536);
1105+
tfr->effective_speed_hz = cdiv ? (clk_hz / cdiv) : (clk_hz / 65536);
11061106
bcm2835_wr(bs, BCM2835_SPI_CLK, cdiv);
11071107

11081108
/* handle all the 3-wire mode */
@@ -1122,7 +1122,7 @@ static int bcm2835_spi_transfer_one(struct spi_controller *ctlr,
11221122
* per 300,000 Hz of bus clock.
11231123
*/
11241124
hz_per_byte = polling_limit_us ? (9 * 1000000) / polling_limit_us : 0;
1125-
byte_limit = hz_per_byte ? spi_used_hz / hz_per_byte : 1;
1125+
byte_limit = hz_per_byte ? tfr->effective_speed_hz / hz_per_byte : 1;
11261126

11271127
/* run in polling mode for short transfers */
11281128
if (tfr->len < byte_limit)

0 commit comments

Comments
 (0)