| Message ID | 20220912084201.1826979-2-alain.volmat@foss.st.com |
|---|---|
| State | Accepted |
| Commit | 923d80288a32b999de3ec51181c46c93f01f953a |
| Delegated to: | Patrick Delaunay |
| Headers | show |
| Series | i2c: stm32: cleanup & stop handling fix | expand |
Hi Alain, On 9/12/22 10:41, Alain Volmat wrote: > Comment within stm32_i2c_message_start is misleading, indicating > that AUTOEND bit is setted while it is actually cleared. > Moreover, the bit is actually never setted so there is no need > to clear it hence get rid of this bit clear and the bit macro > as well. > > Signed-off-by: Alain Volmat <alain.volmat@foss.st.com> > Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com> > --- > drivers/i2c/stm32f7_i2c.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c > index bf2a6c9b4b..78d7156492 100644 > --- a/drivers/i2c/stm32f7_i2c.c > +++ b/drivers/i2c/stm32f7_i2c.c > @@ -57,7 +57,6 @@ struct stm32_i2c_regs { > #define STM32_I2C_CR1_PE BIT(0) > > /* STM32 I2C control 2 */ > -#define STM32_I2C_CR2_AUTOEND BIT(25) > #define STM32_I2C_CR2_RELOAD BIT(24) > #define STM32_I2C_CR2_NBYTES_MASK GENMASK(23, 16) > #define STM32_I2C_CR2_NBYTES(n) ((n & 0xff) << 16) > @@ -304,9 +303,8 @@ static void stm32_i2c_message_start(struct stm32_i2c_priv *i2c_priv, > cr2 |= STM32_I2C_CR2_SADD7(msg->addr); > } > > - /* Set nb bytes to transfer and reload or autoend bits */ > - cr2 &= ~(STM32_I2C_CR2_NBYTES_MASK | STM32_I2C_CR2_RELOAD | > - STM32_I2C_CR2_AUTOEND); > + /* Set nb bytes to transfer and reload (if needed) */ > + cr2 &= ~(STM32_I2C_CR2_NBYTES_MASK | STM32_I2C_CR2_RELOAD); > if (msg->len > STM32_I2C_MAX_LEN) { > cr2 |= STM32_I2C_CR2_NBYTES(STM32_I2C_MAX_LEN); > cr2 |= STM32_I2C_CR2_RELOAD; Applied to u-boot-stm/master, thanks! I also add the missing Reviewed-by when I get the patch from patchwork http://patchwork.ozlabs.org/project/uboot/patch/20220912084201.1826979-2-alain.volmat@foss.st.com/ + Reviewed-by: Heiko Schocher <hs@denx.de> + Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com> Regards Patrick
diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c index bf2a6c9b4b..78d7156492 100644 --- a/drivers/i2c/stm32f7_i2c.c +++ b/drivers/i2c/stm32f7_i2c.c @@ -57,7 +57,6 @@ struct stm32_i2c_regs { #define STM32_I2C_CR1_PE BIT(0) /* STM32 I2C control 2 */ -#define STM32_I2C_CR2_AUTOEND BIT(25) #define STM32_I2C_CR2_RELOAD BIT(24) #define STM32_I2C_CR2_NBYTES_MASK GENMASK(23, 16) #define STM32_I2C_CR2_NBYTES(n) ((n & 0xff) << 16) @@ -304,9 +303,8 @@ static void stm32_i2c_message_start(struct stm32_i2c_priv *i2c_priv, cr2 |= STM32_I2C_CR2_SADD7(msg->addr); } - /* Set nb bytes to transfer and reload or autoend bits */ - cr2 &= ~(STM32_I2C_CR2_NBYTES_MASK | STM32_I2C_CR2_RELOAD | - STM32_I2C_CR2_AUTOEND); + /* Set nb bytes to transfer and reload (if needed) */ + cr2 &= ~(STM32_I2C_CR2_NBYTES_MASK | STM32_I2C_CR2_RELOAD); if (msg->len > STM32_I2C_MAX_LEN) { cr2 |= STM32_I2C_CR2_NBYTES(STM32_I2C_MAX_LEN); cr2 |= STM32_I2C_CR2_RELOAD;