Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-22 23:52:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

i2c: stm32f7: move driver data of each instance in a privdata

Browse source 
Today all the I2C instance point on the same global
variable stm32_i2c_setup according the compatible: i2c_priv->setup =
pointer to the same driver data.

This patch changes this driver data (stm32f7_setup and stm32mp15_setup)
to a const struct and move the timing struct 'setup' as element of i2c
privdata, initialized in stm32_ofdata_to_platdata() with the driver
configuration data.

This patch solves issues when several I2C instance have not the same
clock source or not the same configuration: each timing setup is saved
is the I2C privdata.

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
This commit is contained in:
Patrick Delaunay 2021-08-03 12:05:09 +02:00 committed by Patrice Chotard
parent 81b2445af4
commit 1fd9eb68d6
1 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
drivers/i2c/stm32f7_i2c.c
View file

@ -158,7 +158,6 @@ struct stm32_i2c_spec {
* @fall_time: Fall time (ns) * @fall_time: Fall time (ns)
* @dnf: Digital filter coefficient (0-16) * @dnf: Digital filter coefficient (0-16)
* @analog_filter: Analog filter delay (On/Off) * @analog_filter: Analog filter delay (On/Off)
* @fmp_clr_offset: Fast Mode Plus clear register offset from set register
*/ */
struct stm32_i2c_setup { struct stm32_i2c_setup {
u32 speed_freq; u32 speed_freq;
@ -167,6 +166,13 @@ struct stm32_i2c_setup {
u32 fall_time; u32 fall_time;
u8 dnf; u8 dnf;
bool analog_filter; bool analog_filter;
};
/**
* struct stm32_i2c_data - driver data for I2C configuration by compatible
* @fmp_clr_offset: Fast Mode Plus clear register offset from set register
*/
struct stm32_i2c_data {
u32 fmp_clr_offset; u32 fmp_clr_offset;
}; };
@ -201,7 +207,7 @@ struct stm32_i2c_timings {
struct stm32_i2c_priv { struct stm32_i2c_priv {
struct stm32_i2c_regs *regs; struct stm32_i2c_regs *regs;
struct clk clk; struct clk clk;
struct stm32_i2c_setup *setup; struct stm32_i2c_setup setup;
u32 speed; u32 speed;
struct regmap *regmap; struct regmap *regmap;
u32 regmap_sreg; u32 regmap_sreg;
@ -251,18 +257,11 @@ static const struct stm32_i2c_spec i2c_specs[] = {
}, },
}; };
static const struct stm32_i2c_setup stm32f7_setup = { static const struct stm32_i2c_data stm32f7_data = {
.rise_time = STM32_I2C_RISE_TIME_DEFAULT, .fmp_clr_offset = 0x00,
.fall_time = STM32_I2C_FALL_TIME_DEFAULT,
.dnf = STM32_I2C_DNF_DEFAULT,
.analog_filter = STM32_I2C_ANALOG_FILTER_ENABLE,
}; };
static const struct stm32_i2c_setup stm32mp15_setup = { static const struct stm32_i2c_data stm32mp15_data = {
.rise_time = STM32_I2C_RISE_TIME_DEFAULT,
.fall_time = STM32_I2C_FALL_TIME_DEFAULT,
.dnf = STM32_I2C_DNF_DEFAULT,
.analog_filter = STM32_I2C_ANALOG_FILTER_ENABLE,
.fmp_clr_offset = 0x40, .fmp_clr_offset = 0x40,
}; };
@ -745,7 +744,7 @@ static u32 get_lower_rate(u32 rate)
static int stm32_i2c_setup_timing(struct stm32_i2c_priv *i2c_priv, static int stm32_i2c_setup_timing(struct stm32_i2c_priv *i2c_priv,
struct stm32_i2c_timings *timing) struct stm32_i2c_timings *timing)
{ {
struct stm32_i2c_setup *setup = i2c_priv->setup; struct stm32_i2c_setup *setup = &i2c_priv->setup;
int ret = 0; int ret = 0;
setup->speed_freq = i2c_priv->speed; setup->speed_freq = i2c_priv->speed;
@ -839,10 +838,11 @@ static int stm32_i2c_hw_config(struct stm32_i2c_priv *i2c_priv)
writel(timing, &regs->timingr); writel(timing, &regs->timingr);
/* Enable I2C */ /* Enable I2C */
if (i2c_priv->setup->analog_filter) if (i2c_priv->setup.analog_filter)
clrbits_le32(&regs->cr1, STM32_I2C_CR1_ANFOFF); clrbits_le32(&regs->cr1, STM32_I2C_CR1_ANFOFF);
else else
setbits_le32(&regs->cr1, STM32_I2C_CR1_ANFOFF); setbits_le32(&regs->cr1, STM32_I2C_CR1_ANFOFF);
setbits_le32(&regs->cr1, STM32_I2C_CR1_PE); setbits_le32(&regs->cr1, STM32_I2C_CR1_PE);
return 0; return 0;
@ -903,21 +903,23 @@ clk_free:
static int stm32_of_to_plat(struct udevice *dev) static int stm32_of_to_plat(struct udevice *dev)
{ {
const struct stm32_i2c_data *data;
struct stm32_i2c_priv *i2c_priv = dev_get_priv(dev); struct stm32_i2c_priv *i2c_priv = dev_get_priv(dev);
u32 rise_time, fall_time; u32 rise_time, fall_time;
int ret; int ret;
i2c_priv->setup = (struct stm32_i2c_setup *)dev_get_driver_data(dev); data = (const struct stm32_i2c_data *)dev_get_driver_data(dev);
if (!i2c_priv->setup) if (!data)
return -EINVAL; return -EINVAL;
rise_time = dev_read_u32_default(dev, "i2c-scl-rising-time-ns", 0); rise_time = dev_read_u32_default(dev, "i2c-scl-rising-time-ns",
if (rise_time) STM32_I2C_RISE_TIME_DEFAULT);
i2c_priv->setup->rise_time = rise_time;
fall_time = dev_read_u32_default(dev, "i2c-scl-falling-time-ns", 0); fall_time = dev_read_u32_default(dev, "i2c-scl-falling-time-ns",
if (fall_time) STM32_I2C_FALL_TIME_DEFAULT);
i2c_priv->setup->fall_time = fall_time;
i2c_priv->setup.dnf = STM32_I2C_DNF_DEFAULT;
i2c_priv->setup.analog_filter = STM32_I2C_ANALOG_FILTER_ENABLE;
/* Optional */ /* Optional */
i2c_priv->regmap = syscon_regmap_lookup_by_phandle(dev, i2c_priv->regmap = syscon_regmap_lookup_by_phandle(dev,
@ -930,8 +932,7 @@ static int stm32_of_to_plat(struct udevice *dev)
return ret; return ret;
i2c_priv->regmap_sreg = fmp[1]; i2c_priv->regmap_sreg = fmp[1];
i2c_priv->regmap_creg = fmp[1] + i2c_priv->regmap_creg = fmp[1] + data->fmp_clr_offset;
i2c_priv->setup->fmp_clr_offset;
i2c_priv->regmap_mask = fmp[2]; i2c_priv->regmap_mask = fmp[2];
} }
@ -944,8 +945,8 @@ static const struct dm_i2c_ops stm32_i2c_ops = {
}; };
static const struct udevice_id stm32_i2c_of_match[] = { static const struct udevice_id stm32_i2c_of_match[] = {
{ .compatible = "st,stm32f7-i2c", .data = (ulong)&stm32f7_setup }, { .compatible = "st,stm32f7-i2c", .data = (ulong)&stm32f7_data },
{ .compatible = "st,stm32mp15-i2c", .data = (ulong)&stm32mp15_setup }, { .compatible = "st,stm32mp15-i2c", .data = (ulong)&stm32mp15_data },
{} {}
}; };