Skip to content

Commit 7ad2882

Browse files
ambarusbroonie
authored andcommitted
spi: s3c64xx: switch exynos850 to new port config data
Exynos850 has the same version of USI SPI (v2.1) as GS101. Drop the fifo_lvl_mask and rx_lvl_offset and switch to the new port config data. Backward compatibility with DT is not broken because when alises are set: - the SPI core will set the bus number according to the alias ID - the FIFO depth is always the same size for exynos850 (64 bytes) no matter the alias ID number. Advantages of the change: - drop dependency on the OF alias ID. - FIFO depth is inferred from the compatible. Exynos850 integrates 3 SPI IPs, all with 64 bytes FIFO depths. - use full mask for SPI_STATUS.{RX, TX}_FIFO_LVL fields. Using partial masks is misleading and can hide problems of the driver logic. Just compiled tested. Signed-off-by: Tudor Ambarus <[email protected]> Link: https://msgid.link/r/[email protected] Tested-by: Sam Protsenko <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent e8b16c7 commit 7ad2882

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

drivers/spi/spi-s3c64xx.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,10 +1576,9 @@ static const struct s3c64xx_spi_port_config exynos5433_spi_port_config = {
15761576
};
15771577

15781578
static const struct s3c64xx_spi_port_config exynos850_spi_port_config = {
1579-
/* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
1580-
.fifo_lvl_mask = { 0x7f, 0x7f, 0x7f },
1581-
/* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
1582-
.rx_lvl_offset = 15,
1579+
.fifo_depth = 64,
1580+
.rx_fifomask = S3C64XX_SPI_ST_RX_FIFO_RDY_V2,
1581+
.tx_fifomask = S3C64XX_SPI_ST_TX_FIFO_RDY_V2,
15831582
.tx_st_done = 25,
15841583
.clk_div = 4,
15851584
.high_speed = true,

0 commit comments

Comments
 (0)