@@ -135,8 +135,8 @@ struct s3c64xx_spi_dma_data {
135135
136136/**
137137 * struct s3c64xx_spi_port_config - SPI Controller hardware info
138- * @fifo_lvl_mask: Bit-mask for {TX|RX}_FIFO_LVL bits in SPI_STATUS register .
139- * @rx_lvl_offset: Bit offset of RX_FIFO_LVL bits in SPI_STATUS regiter .
138+ * @fifo_lvl_mask: [DEPRECATED] use @{rx, tx}_fifomask instead .
139+ * @rx_lvl_offset: [DEPRECATED] use @{rx,tx}_fifomask instead .
140140 * @fifo_depth: depth of the FIFO.
141141 * @rx_fifomask: SPI_STATUS.RX_FIFO_LVL mask. Shifted mask defining the field's
142142 * length and position.
@@ -192,7 +192,7 @@ struct s3c64xx_spi_port_config {
192192 * @rx_dma: Local receive DMA data (e.g. chan and direction)
193193 * @tx_dma: Local transmit DMA data (e.g. chan and direction)
194194 * @port_conf: Local SPI port configuration data
195- * @port_id: Port identification number
195+ * @port_id: [DEPRECATED] use @{rx,tx}_fifomask instead.
196196 * @fifo_depth: depth of the FIFO.
197197 * @rx_fifomask: SPI_STATUS.RX_FIFO_LVL mask. Shifted mask defining the field's
198198 * length and position.
@@ -1508,30 +1508,38 @@ static const struct dev_pm_ops s3c64xx_spi_pm = {
15081508};
15091509
15101510static const struct s3c64xx_spi_port_config s3c2443_spi_port_config = {
1511+ /* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
15111512 .fifo_lvl_mask = { 0x7f },
1513+ /* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
15121514 .rx_lvl_offset = 13 ,
15131515 .tx_st_done = 21 ,
15141516 .clk_div = 2 ,
15151517 .high_speed = true,
15161518};
15171519
15181520static const struct s3c64xx_spi_port_config s3c6410_spi_port_config = {
1521+ /* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
15191522 .fifo_lvl_mask = { 0x7f , 0x7F },
1523+ /* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
15201524 .rx_lvl_offset = 13 ,
15211525 .tx_st_done = 21 ,
15221526 .clk_div = 2 ,
15231527};
15241528
15251529static const struct s3c64xx_spi_port_config s5pv210_spi_port_config = {
1530+ /* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
15261531 .fifo_lvl_mask = { 0x1ff , 0x7F },
1532+ /* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
15271533 .rx_lvl_offset = 15 ,
15281534 .tx_st_done = 25 ,
15291535 .clk_div = 2 ,
15301536 .high_speed = true,
15311537};
15321538
15331539static const struct s3c64xx_spi_port_config exynos4_spi_port_config = {
1540+ /* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
15341541 .fifo_lvl_mask = { 0x1ff , 0x7F , 0x7F },
1542+ /* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
15351543 .rx_lvl_offset = 15 ,
15361544 .tx_st_done = 25 ,
15371545 .clk_div = 2 ,
@@ -1541,7 +1549,9 @@ static const struct s3c64xx_spi_port_config exynos4_spi_port_config = {
15411549};
15421550
15431551static const struct s3c64xx_spi_port_config exynos7_spi_port_config = {
1552+ /* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
15441553 .fifo_lvl_mask = { 0x1ff , 0x7F , 0x7F , 0x7F , 0x7F , 0x1ff },
1554+ /* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
15451555 .rx_lvl_offset = 15 ,
15461556 .tx_st_done = 25 ,
15471557 .clk_div = 2 ,
@@ -1551,7 +1561,9 @@ static const struct s3c64xx_spi_port_config exynos7_spi_port_config = {
15511561};
15521562
15531563static const struct s3c64xx_spi_port_config exynos5433_spi_port_config = {
1564+ /* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
15541565 .fifo_lvl_mask = { 0x1ff , 0x7f , 0x7f , 0x7f , 0x7f , 0x1ff },
1566+ /* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
15551567 .rx_lvl_offset = 15 ,
15561568 .tx_st_done = 25 ,
15571569 .clk_div = 2 ,
@@ -1562,7 +1574,9 @@ static const struct s3c64xx_spi_port_config exynos5433_spi_port_config = {
15621574};
15631575
15641576static const struct s3c64xx_spi_port_config exynos850_spi_port_config = {
1577+ /* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
15651578 .fifo_lvl_mask = { 0x7f , 0x7f , 0x7f },
1579+ /* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
15661580 .rx_lvl_offset = 15 ,
15671581 .tx_st_done = 25 ,
15681582 .clk_div = 4 ,
@@ -1573,8 +1587,10 @@ static const struct s3c64xx_spi_port_config exynos850_spi_port_config = {
15731587};
15741588
15751589static const struct s3c64xx_spi_port_config exynosautov9_spi_port_config = {
1590+ /* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
15761591 .fifo_lvl_mask = { 0x1ff , 0x1ff , 0x7f , 0x7f , 0x7f , 0x7f , 0x1ff , 0x7f ,
15771592 0x7f , 0x7f , 0x7f , 0x7f },
1593+ /* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
15781594 .rx_lvl_offset = 15 ,
15791595 .tx_st_done = 25 ,
15801596 .clk_div = 4 ,
@@ -1586,7 +1602,9 @@ static const struct s3c64xx_spi_port_config exynosautov9_spi_port_config = {
15861602};
15871603
15881604static const struct s3c64xx_spi_port_config fsd_spi_port_config = {
1605+ /* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
15891606 .fifo_lvl_mask = { 0x7f , 0x7f , 0x7f , 0x7f , 0x7f },
1607+ /* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
15901608 .rx_lvl_offset = 15 ,
15911609 .tx_st_done = 25 ,
15921610 .clk_div = 2 ,
@@ -1597,8 +1615,10 @@ static const struct s3c64xx_spi_port_config fsd_spi_port_config = {
15971615};
15981616
15991617static const struct s3c64xx_spi_port_config gs101_spi_port_config = {
1618+ /* fifo_lvl_mask is deprecated. Use {rx, tx}_fifomask instead. */
16001619 .fifo_lvl_mask = { 0x7f , 0x7f , 0x7f , 0x7f , 0x7f , 0x7f , 0x7f , 0x7f ,
16011620 0x7f , 0x7f , 0x7f , 0x7f , 0x7f , 0x7f , 0x7f , 0x7f },
1621+ /* rx_lvl_offset is deprecated. Use {rx, tx}_fifomask instead. */
16021622 .rx_lvl_offset = 15 ,
16031623 .tx_st_done = 25 ,
16041624 .clk_div = 4 ,
0 commit comments