Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ec198bd authored by Alain Volmat's avatar Alain Volmat Committed by Greg Kroah-Hartman
Browse files

i2c: stm32f7: fix configuration of the digital filter 



[ Upstream commit 3d6a3d3a2a7a3a60a824e7c04e95fd50dec57812 ]

The digital filter related computation are present in the driver
however the programming of the filter within the IP is missing.
The maximum value for the DNF is wrong and should be 15 instead of 16.

Fixes: aeb068c5 ("i2c: i2c-stm32f7: add driver")

Signed-off-by: default avatarAlain Volmat <alain.volmat@foss.st.com>
Signed-off-by: default avatarPierre-Yves MORDRET <pierre-yves.mordret@foss.st.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5b6e3fb4

drivers/i2c/busses/i2c-stm32f7.c

+10 −1
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ 
#define STM32F7_I2C_CR1_RXDMAEN			BIT(15)

#define STM32F7_I2C_CR1_TXDMAEN			BIT(14)

#define STM32F7_I2C_CR1_ANFOFF			BIT(12)

#define STM32F7_I2C_CR1_DNF_MASK		GENMASK(11, 8)

#define STM32F7_I2C_CR1_DNF(n)			(((n) & 0xf) << 8)

#define STM32F7_I2C_CR1_ERRIE			BIT(7)

#define STM32F7_I2C_CR1_TCIE			BIT(6)

#define STM32F7_I2C_CR1_STOPIE			BIT(5)
@@ -147,7 +149,7 @@ 
#define STM32F7_I2C_MAX_SLAVE			0x2



#define STM32F7_I2C_DNF_DEFAULT			0

#define STM32F7_I2C_DNF_MAX			16

#define STM32F7_I2C_DNF_MAX			15



#define STM32F7_I2C_ANALOG_FILTER_ENABLE	1

#define STM32F7_I2C_ANALOG_FILTER_DELAY_MIN	50	/* ns */
@@ -645,6 +647,13 @@ static void stm32f7_i2c_hw_config(struct stm32f7_i2c_dev *i2c_dev) 
	else

		stm32f7_i2c_set_bits(i2c_dev->base + STM32F7_I2C_CR1,

				     STM32F7_I2C_CR1_ANFOFF);



	/* Program the Digital Filter */

	stm32f7_i2c_clr_bits(i2c_dev->base + STM32F7_I2C_CR1,

			     STM32F7_I2C_CR1_DNF_MASK);

	stm32f7_i2c_set_bits(i2c_dev->base + STM32F7_I2C_CR1,

			     STM32F7_I2C_CR1_DNF(i2c_dev->setup.dnf));



	stm32f7_i2c_set_bits(i2c_dev->base + STM32F7_I2C_CR1,

			     STM32F7_I2C_CR1_PE);

}