Commit b62590a9 authored by Alain Volmat's avatar Alain Volmat Committed by Wolfram Sang

i2c: stm32: name slave slot to ease maintenance

Name slave slots in order to ease code maintenance.
Signed-off-by: default avatarAlain Volmat <alain.volmat@st.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent b713aa86
...@@ -152,7 +152,12 @@ ...@@ -152,7 +152,12 @@
#define STM32F7_I2C_MAX_LEN 0xff #define STM32F7_I2C_MAX_LEN 0xff
#define STM32F7_I2C_DMA_LEN_MIN 0x16 #define STM32F7_I2C_DMA_LEN_MIN 0x16
#define STM32F7_I2C_MAX_SLAVE 0x3 enum {
STM32F7_SLAVE_HOSTNOTIFY,
STM32F7_SLAVE_7_10_BITS_ADDR,
STM32F7_SLAVE_7_BITS_ADDR,
STM32F7_I2C_MAX_SLAVE
};
#define STM32F7_I2C_DNF_DEFAULT 0 #define STM32F7_I2C_DNF_DEFAULT 0
#define STM32F7_I2C_DNF_MAX 16 #define STM32F7_I2C_DNF_MAX 16
...@@ -1327,19 +1332,20 @@ static int stm32f7_i2c_get_free_slave_id(struct stm32f7_i2c_dev *i2c_dev, ...@@ -1327,19 +1332,20 @@ static int stm32f7_i2c_get_free_slave_id(struct stm32f7_i2c_dev *i2c_dev,
int i; int i;
/* /*
* slave[0] support only SMBus Host address (0x8) * slave[STM32F7_SLAVE_HOSTNOTIFY] support only SMBus Host address (0x8)
* slave[1] supports 7-bit and 10-bit slave address * slave[STM32F7_SLAVE_7_10_BITS_ADDR] supports 7-bit and 10-bit slave address
* slave[2] supports 7-bit slave address only * slave[STM32F7_SLAVE_7_BITS_ADDR] supports 7-bit slave address only
*/ */
if (i2c_dev->smbus_mode && (slave->addr == 0x08)) { if (i2c_dev->smbus_mode && (slave->addr == 0x08)) {
if (i2c_dev->slave[0]) if (i2c_dev->slave[STM32F7_SLAVE_HOSTNOTIFY])
goto fail; goto fail;
*id = 0; *id = STM32F7_SLAVE_HOSTNOTIFY;
return 0; return 0;
} }
for (i = STM32F7_I2C_MAX_SLAVE - 1; i > 0; i--) { for (i = STM32F7_I2C_MAX_SLAVE - 1; i > STM32F7_SLAVE_HOSTNOTIFY; i--) {
if (i == 2 && (slave->flags & I2C_CLIENT_TEN)) if ((i == STM32F7_SLAVE_7_BITS_ADDR) &&
(slave->flags & I2C_CLIENT_TEN))
continue; continue;
if (!i2c_dev->slave[i]) { if (!i2c_dev->slave[i]) {
*id = i; *id = i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment