dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-29 22:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

i2c: stm32: Update to use standard enums for speed

Browse Source 
Update this driver to use the new standard enums for speed.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Patrick Delaunay <patrick.delaunay@st.com>
Tested-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
Simon Glass
2020-01-23 11:48:21 -07:00
committed by Heiko Schocher
parent 4bef53684f
commit b0a22d0fa9
1 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/i2c/stm32f7_i2c.c
View File

@@ -115,17 +115,6 @@ struct stm32_i2c_regs {
#define STM32_NSEC_PER_SEC 1000000000L #define STM32_NSEC_PER_SEC 1000000000L
#define STANDARD_RATE 100000
#define FAST_RATE 400000
#define FAST_PLUS_RATE 1000000
enum stm32_i2c_speed {
STM32_I2C_SPEED_STANDARD, /* 100 kHz */
STM32_I2C_SPEED_FAST, /* 400 kHz */
STM32_I2C_SPEED_FAST_PLUS, /* 1 MHz */
STM32_I2C_SPEED_END,
};
/** /**
* struct stm32_i2c_spec - private i2c specification timing * struct stm32_i2c_spec - private i2c specification timing
* @rate: I2C bus speed (Hz) * @rate: I2C bus speed (Hz)
@@ -164,7 +153,7 @@ struct stm32_i2c_spec {
* @analog_filter: Analog filter delay (On/Off) * @analog_filter: Analog filter delay (On/Off)
*/ */
struct stm32_i2c_setup { struct stm32_i2c_setup {
enum stm32_i2c_speed speed; enum i2c_speed_mode speed;
u32 speed_freq; u32 speed_freq;
u32 clock_src; u32 clock_src;
u32 rise_time; u32 rise_time;
@@ -198,8 +187,8 @@ struct stm32_i2c_priv {
}; };
static const struct stm32_i2c_spec i2c_specs[] = { static const struct stm32_i2c_spec i2c_specs[] = {
[STM32_I2C_SPEED_STANDARD] = { [IC_SPEED_MODE_STANDARD] = {
.rate = STANDARD_RATE, .rate = I2C_SPEED_STANDARD_RATE,
.rate_min = 8000, .rate_min = 8000,
.rate_max = 120000, .rate_max = 120000,
.fall_max = 300, .fall_max = 300,
@@ -210,8 +199,8 @@ static const struct stm32_i2c_spec i2c_specs[] = {
.l_min = 4700, .l_min = 4700,
.h_min = 4000, .h_min = 4000,
}, },
[STM32_I2C_SPEED_FAST] = { [IC_SPEED_MODE_FAST] = {
.rate = FAST_RATE, .rate = I2C_SPEED_FAST_RATE,
.rate_min = 320000, .rate_min = 320000,
.rate_max = 480000, .rate_max = 480000,
.fall_max = 300, .fall_max = 300,
@@ -222,8 +211,8 @@ static const struct stm32_i2c_spec i2c_specs[] = {
.l_min = 1300, .l_min = 1300,
.h_min = 600, .h_min = 600,
}, },
[STM32_I2C_SPEED_FAST_PLUS] = { [IC_SPEED_MODE_FAST_PLUS] = {
.rate = FAST_PLUS_RATE, .rate = I2C_SPEED_FAST_PLUS_RATE,
.rate_min = 800000, .rate_min = 800000,
.rate_max = 1200000, .rate_max = 1200000,
.fall_max = 100, .fall_max = 100,
@@ -648,9 +637,9 @@ static int stm32_i2c_compute_timing(struct stm32_i2c_priv *i2c_priv,
struct list_head solutions; struct list_head solutions;
int ret; int ret;
if (setup->speed >= STM32_I2C_SPEED_END) { if (setup->speed >= ARRAY_SIZE(i2c_specs)) {
pr_err("%s: speed out of bound {%d/%d}\n", __func__, pr_err("%s: speed out of bound {%d/%d}\n", __func__,
setup->speed, STM32_I2C_SPEED_END - 1); setup->speed, ARRAY_SIZE(i2c_specs) - 1);
return -EINVAL; return -EINVAL;
} }
@@ -719,7 +708,7 @@ static int stm32_i2c_setup_timing(struct stm32_i2c_priv *i2c_priv,
if (ret) { if (ret) {
debug("%s: failed to compute I2C timings.\n", debug("%s: failed to compute I2C timings.\n",
__func__); __func__);
if (i2c_priv->speed > STM32_I2C_SPEED_STANDARD) { if (i2c_priv->speed > IC_SPEED_MODE_STANDARD) {
i2c_priv->speed--; i2c_priv->speed--;
setup->speed = i2c_priv->speed; setup->speed = i2c_priv->speed;
setup->speed_freq = setup->speed_freq =
@@ -784,14 +773,14 @@ static int stm32_i2c_set_bus_speed(struct udevice *bus, unsigned int speed)
struct stm32_i2c_priv *i2c_priv = dev_get_priv(bus); struct stm32_i2c_priv *i2c_priv = dev_get_priv(bus);
switch (speed) { switch (speed) {
case STANDARD_RATE: case I2C_SPEED_STANDARD_RATE:
i2c_priv->speed = STM32_I2C_SPEED_STANDARD; i2c_priv->speed = IC_SPEED_MODE_STANDARD;
break; break;
case FAST_RATE: case I2C_SPEED_FAST_RATE:
i2c_priv->speed = STM32_I2C_SPEED_FAST; i2c_priv->speed = IC_SPEED_MODE_FAST;
break; break;
case FAST_PLUS_RATE: case I2C_SPEED_FAST_PLUS_RATE:
i2c_priv->speed = STM32_I2C_SPEED_FAST_PLUS; i2c_priv->speed = IC_SPEED_MODE_FAST_PLUS;
break; break;
default: default:
debug("%s: Speed %d not supported\n", __func__, speed); debug("%s: Speed %d not supported\n", __func__, speed);