[PATCH 8/8] i2c: omap: Add OMAP_I2C_BUF_{TX,RX}TRSH definitions
From: Andrew Davis
Date: Fri Sep 04 2026 - 09:24:43 EST
These were just magic numbers before, give them proper definitions
and use those in code.
Signed-off-by: Andrew Davis <afd@xxxxxx>
---
drivers/i2c/busses/i2c-omap.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 41464f92da046..669d931928fb6 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -97,8 +97,10 @@ enum {
/* I2C Buffer Configuration Register (OMAP_I2C_BUF): */
#define OMAP_I2C_BUF_RDMA_EN BIT(15) /* RX DMA channel enable */
#define OMAP_I2C_BUF_RXFIF_CLR BIT(14) /* RX FIFO Clear */
+#define OMAP_I2C_BUF_RXTRSH GENMASK(13, 8) /* RX FIFO Threshold */
#define OMAP_I2C_BUF_XDMA_EN BIT(7) /* TX DMA channel enable */
#define OMAP_I2C_BUF_TXFIF_CLR BIT(6) /* TX FIFO Clear */
+#define OMAP_I2C_BUF_TXTRSH GENMASK(5, 0) /* TX FIFO Threshold */
/* I2C Configuration Register (OMAP_I2C_CON): */
#define OMAP_I2C_CON_EN BIT(15) /* I2C module enable */
@@ -602,12 +604,14 @@ static void omap_i2c_resize_fifo(struct omap_i2c_dev *omap, u8 size, bool is_rx)
if (is_rx) {
/* Clear RX Threshold */
- buf &= ~(0x3f << 8);
- buf |= ((omap->threshold - 1) << 8) | OMAP_I2C_BUF_RXFIF_CLR;
+ buf &= ~OMAP_I2C_BUF_RXTRSH;
+ buf |= FIELD_PREP(OMAP_I2C_BUF_RXTRSH, (omap->threshold - 1));
+ buf |= OMAP_I2C_BUF_RXFIF_CLR;
} else {
/* Clear TX Threshold */
- buf &= ~0x3f;
- buf |= (omap->threshold - 1) | OMAP_I2C_BUF_TXFIF_CLR;
+ buf &= ~OMAP_I2C_BUF_TXTRSH;
+ buf |= FIELD_PREP(OMAP_I2C_BUF_TXTRSH, (omap->threshold - 1));
+ buf |= OMAP_I2C_BUF_TXFIF_CLR;
}
omap_i2c_write_reg(omap, OMAP_I2C_BUF_REG, buf);
--
2.39.2