diff options
| author | Andi Shyti <andi.shyti@kernel.org> | 2026-10-09 10:57:16 +0200 |
|---|---|---|
| committer | Andi Shyti <andi.shyti@kernel.org> | 2026-10-09 10:57:16 +0200 |
| commit | cde37ff0bd247bb79d0473aaa82e7ad7eb094396 (patch) | |
| tree | 68dfa195af292bfa04078fdf2332492f37731f3b | |
| parent | 0f7dcc8c49cc12050bc3e63f593ce13b3dc87f1d (diff) | |
| parent | 0265dfc5d2a8de303561ced996c46b38f95cb4ef (diff) | |
| download | linux-next-cde37ff0bd247bb79d0473aaa82e7ad7eb094396.tar.gz linux-next-cde37ff0bd247bb79d0473aaa82e7ad7eb094396.zip | |
Merge branch 'i2c/i2c' into i2c/i2c-next
| -rw-r--r-- | drivers/i2c/busses/i2c-qcom-cci.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/i2c/busses/i2c-qcom-cci.c b/drivers/i2c/busses/i2c-qcom-cci.c index 6d8be7b8b79d..04e3053e6454 100644 --- a/drivers/i2c/busses/i2c-qcom-cci.c +++ b/drivers/i2c/busses/i2c-qcom-cci.c @@ -28,6 +28,7 @@ #define CCI_I2C_Mm_SDA_CTL_1(m) (0x108 + 0x100 * (m)) #define CCI_I2C_Mm_SDA_CTL_2(m) (0x10c + 0x100 * (m)) #define CCI_I2C_Mm_MISC_CTL(m) (0x110 + 0x100 * (m)) +#define CCI_I2C_MISC_CTL_SCL_STRETCH_EN BIT(8) #define CCI_I2C_Mm_READ_DATA(m) (0x118 + 0x100 * (m)) #define CCI_I2C_Mm_READ_BUF_LEVEL(m) (0x11c + 0x100 * (m)) @@ -105,7 +106,6 @@ struct hw_params { u16 thd_dat; /* data hold time */ u16 thd_sta; /* hold time (repeated) START condition */ u16 tbuf; /* bus free time between a STOP and START condition */ - u8 scl_stretch_en; u16 trdhld; u16 tsp; /* pulse width of spikes suppressed by the input filter */ }; @@ -260,7 +260,6 @@ static const struct hw_params cci_hw_params[NUM_CCI_CLK_RATES][NUM_I2C_MODES] = .thd_dat = 10, .thd_sta = 77, .tbuf = 118, - .scl_stretch_en = 0, .trdhld = 6, .tsp = 1 }, @@ -272,7 +271,6 @@ static const struct hw_params cci_hw_params[NUM_CCI_CLK_RATES][NUM_I2C_MODES] = .thd_dat = 13, .thd_sta = 18, .tbuf = 32, - .scl_stretch_en = 0, .trdhld = 6, .tsp = 3 }, @@ -284,7 +282,6 @@ static const struct hw_params cci_hw_params[NUM_CCI_CLK_RATES][NUM_I2C_MODES] = .thd_dat = 22, .thd_sta = 162, .tbuf = 227, - .scl_stretch_en = 0, .trdhld = 6, .tsp = 3 }, @@ -296,7 +293,6 @@ static const struct hw_params cci_hw_params[NUM_CCI_CLK_RATES][NUM_I2C_MODES] = .thd_dat = 22, .thd_sta = 35, .tbuf = 62, - .scl_stretch_en = 0, .trdhld = 6, .tsp = 3 }, @@ -308,7 +304,6 @@ static const struct hw_params cci_hw_params[NUM_CCI_CLK_RATES][NUM_I2C_MODES] = .thd_dat = 16, .thd_sta = 15, .tbuf = 24, - .scl_stretch_en = 0, .trdhld = 3, .tsp = 3 }, @@ -368,7 +363,7 @@ static int cci_init(struct cci *cci) val = hw->tbuf; writel(val, cci->base + CCI_I2C_Mm_SDA_CTL_2(i)); - val = hw->scl_stretch_en << 8 | hw->trdhld << 4 | hw->tsp; + val = CCI_I2C_MISC_CTL_SCL_STRETCH_EN | hw->trdhld << 4 | hw->tsp; writel(val, cci->base + CCI_I2C_Mm_MISC_CTL(i)); } |