kevin/linux
1
Fork 0
Code

spi: s3c64xx: deprecate fifo_lvl_mask, rx_lvl_offset and port_id

Browse Source 
Deprecate fifo_lvl_mask, rx_lvl_offset and port_id. One shall use
{rx, tx}_fifomask instead. Add messages to each port configuration.

Suggested-by: Sam Protsenko <semen.protsenko@linaro.org>
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
Link: https://msgid.link/r/20240216070555.2483977-11-tudor.ambarus@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Tudor Ambarus 2024-02-16 07:05:53 +00:00 committed by Mark Brown
parent ea3fba7c41
commit ad0adac84d
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/spi/spi-s3c64xx.c
View File

@ -135,8 +135,8 @@ struct s3c64xx_spi_dma_data {
/** /**
* struct s3c64xx_spi_port_config - SPI Controller hardware info * struct s3c64xx_spi_port_config - SPI Controller hardware info
* @fifo_lvl_mask: Bit-mask for {TX|RX}_FIFO_LVL bits in SPI_STATUS register. * @fifo_lvl_mask: [DEPRECATED] use @{rx, tx}_fifomask instead.
* @rx_lvl_offset: Bit offset of RX_FIFO_LVL bits in SPI_STATUS regiter. * @rx_lvl_offset: [DEPRECATED] use @{rx,tx}_fifomask instead.
* @fifo_depth: depth of the FIFO. * @fifo_depth: depth of the FIFO.
* @rx_fifomask: SPI_STATUS.RX_FIFO_LVL mask. Shifted mask defining the field's * @rx_fifomask: SPI_STATUS.RX_FIFO_LVL mask. Shifted mask defining the field's
* length and position. * length and position.
@ -192,7 +192,7 @@ struct s3c64xx_spi_port_config {
* @rx_dma: Local receive DMA data (e.g. chan and direction) * @rx_dma: Local receive DMA data (e.g. chan and direction)
* @tx_dma: Local transmit DMA data (e.g. chan and direction) * @tx_dma: Local transmit DMA data (e.g. chan and direction)
* @port_conf: Local SPI port configuration data * @port_conf: Local SPI port configuration data
* @port_id: Port identification number * @port_id: [DEPRECATED] use @{rx,tx}_fifomask instead.
* @fifo_depth: depth of the FIFO. * @fifo_depth: depth of the FIFO.
* @rx_fifomask: SPI_STATUS.RX_FIFO_LVL mask. Shifted mask defining the field's * @rx_fifomask: SPI_STATUS.RX_FIFO_LVL mask. Shifted mask defining the field's
* length and position. * length and position.
@ -1508,7 +1508,9 @@ static const struct dev_pm_ops s3c64xx_spi_pm = {
}; };
static const struct s3c64xx_spi_port_config s3c2443_spi_port_config = { static const struct s3c64xx_spi_port_config s3c2443_spi_port_config = {
/* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
.fifo_lvl_mask = { 0x7f }, .fifo_lvl_mask = { 0x7f },
/* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
.rx_lvl_offset = 13, .rx_lvl_offset = 13,
.tx_st_done = 21, .tx_st_done = 21,
.clk_div = 2, .clk_div = 2,
@ -1516,14 +1518,18 @@ static const struct s3c64xx_spi_port_config s3c2443_spi_port_config = {
}; };
static const struct s3c64xx_spi_port_config s3c6410_spi_port_config = { static const struct s3c64xx_spi_port_config s3c6410_spi_port_config = {
/* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
.fifo_lvl_mask = { 0x7f, 0x7F }, .fifo_lvl_mask = { 0x7f, 0x7F },
/* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
.rx_lvl_offset = 13, .rx_lvl_offset = 13,
.tx_st_done = 21, .tx_st_done = 21,
.clk_div = 2, .clk_div = 2,
}; };
static const struct s3c64xx_spi_port_config s5pv210_spi_port_config = { static const struct s3c64xx_spi_port_config s5pv210_spi_port_config = {
/* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
.fifo_lvl_mask = { 0x1ff, 0x7F }, .fifo_lvl_mask = { 0x1ff, 0x7F },
/* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
.rx_lvl_offset = 15, .rx_lvl_offset = 15,
.tx_st_done = 25, .tx_st_done = 25,
.clk_div = 2, .clk_div = 2,
@ -1531,7 +1537,9 @@ static const struct s3c64xx_spi_port_config s5pv210_spi_port_config = {
}; };
static const struct s3c64xx_spi_port_config exynos4_spi_port_config = { static const struct s3c64xx_spi_port_config exynos4_spi_port_config = {
/* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
.fifo_lvl_mask = { 0x1ff, 0x7F, 0x7F }, .fifo_lvl_mask = { 0x1ff, 0x7F, 0x7F },
/* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
.rx_lvl_offset = 15, .rx_lvl_offset = 15,
.tx_st_done = 25, .tx_st_done = 25,
.clk_div = 2, .clk_div = 2,
@ -1541,7 +1549,9 @@ static const struct s3c64xx_spi_port_config exynos4_spi_port_config = {
}; };
static const struct s3c64xx_spi_port_config exynos7_spi_port_config = { static const struct s3c64xx_spi_port_config exynos7_spi_port_config = {
/* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
.fifo_lvl_mask = { 0x1ff, 0x7F, 0x7F, 0x7F, 0x7F, 0x1ff}, .fifo_lvl_mask = { 0x1ff, 0x7F, 0x7F, 0x7F, 0x7F, 0x1ff},
/* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
.rx_lvl_offset = 15, .rx_lvl_offset = 15,
.tx_st_done = 25, .tx_st_done = 25,
.clk_div = 2, .clk_div = 2,
@ -1551,7 +1561,9 @@ static const struct s3c64xx_spi_port_config exynos7_spi_port_config = {
}; };
static const struct s3c64xx_spi_port_config exynos5433_spi_port_config = { static const struct s3c64xx_spi_port_config exynos5433_spi_port_config = {
/* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
.fifo_lvl_mask = { 0x1ff, 0x7f, 0x7f, 0x7f, 0x7f, 0x1ff}, .fifo_lvl_mask = { 0x1ff, 0x7f, 0x7f, 0x7f, 0x7f, 0x1ff},
/* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
.rx_lvl_offset = 15, .rx_lvl_offset = 15,
.tx_st_done = 25, .tx_st_done = 25,
.clk_div = 2, .clk_div = 2,
@ -1562,7 +1574,9 @@ static const struct s3c64xx_spi_port_config exynos5433_spi_port_config = {
}; };
static const struct s3c64xx_spi_port_config exynos850_spi_port_config = { static const struct s3c64xx_spi_port_config exynos850_spi_port_config = {
/* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
.fifo_lvl_mask = { 0x7f, 0x7f, 0x7f }, .fifo_lvl_mask = { 0x7f, 0x7f, 0x7f },
/* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
.rx_lvl_offset = 15, .rx_lvl_offset = 15,
.tx_st_done = 25, .tx_st_done = 25,
.clk_div = 4, .clk_div = 4,
@ -1573,8 +1587,10 @@ static const struct s3c64xx_spi_port_config exynos850_spi_port_config = {
}; };
static const struct s3c64xx_spi_port_config exynosautov9_spi_port_config = { static const struct s3c64xx_spi_port_config exynosautov9_spi_port_config = {
/* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
.fifo_lvl_mask = { 0x1ff, 0x1ff, 0x7f, 0x7f, 0x7f, 0x7f, 0x1ff, 0x7f, .fifo_lvl_mask = { 0x1ff, 0x1ff, 0x7f, 0x7f, 0x7f, 0x7f, 0x1ff, 0x7f,
0x7f, 0x7f, 0x7f, 0x7f}, 0x7f, 0x7f, 0x7f, 0x7f},
/* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
.rx_lvl_offset = 15, .rx_lvl_offset = 15,
.tx_st_done = 25, .tx_st_done = 25,
.clk_div = 4, .clk_div = 4,
@ -1586,7 +1602,9 @@ static const struct s3c64xx_spi_port_config exynosautov9_spi_port_config = {
}; };
static const struct s3c64xx_spi_port_config fsd_spi_port_config = { static const struct s3c64xx_spi_port_config fsd_spi_port_config = {
/* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
.fifo_lvl_mask = { 0x7f, 0x7f, 0x7f, 0x7f, 0x7f}, .fifo_lvl_mask = { 0x7f, 0x7f, 0x7f, 0x7f, 0x7f},
/* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
.rx_lvl_offset = 15, .rx_lvl_offset = 15,
.tx_st_done = 25, .tx_st_done = 25,
.clk_div = 2, .clk_div = 2,
@ -1597,8 +1615,10 @@ static const struct s3c64xx_spi_port_config fsd_spi_port_config = {
}; };
static const struct s3c64xx_spi_port_config gs101_spi_port_config = { static const struct s3c64xx_spi_port_config gs101_spi_port_config = {
/* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
.fifo_lvl_mask = { 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, .fifo_lvl_mask = { 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f}, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f},
/* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
.rx_lvl_offset = 15, .rx_lvl_offset = 15,
.tx_st_done = 25, .tx_st_done = 25,
.clk_div = 4, .clk_div = 4,