]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
i2c: mlxcpld: Fix adapter functionality support callback
authorMichael Shych <michaelsh@mellanox.com>
Tue, 27 Mar 2018 14:01:24 +0000 (14:01 +0000)
committerWolfram Sang <wsa@the-dreams.de>
Mon, 30 Apr 2018 08:39:28 +0000 (10:39 +0200)
It fixes report about supported functionality.
Functionality can be different up to CPLD capability.

Fixes: 6bec23bff9149 (i2c: mlxcpld: add master driver for mellanox systems)
Signed-off-by: Michael Shych <michaelsh@mellanox.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-mlxcpld.c

index 4d8efe0dfe305753a171a3f6c7b7c9ad74b48cf0..7341cee9cfe5c69e60f59432d3777b0c3cde8616 100644 (file)
@@ -450,7 +450,14 @@ static int mlxcpld_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
 
 static u32 mlxcpld_i2c_func(struct i2c_adapter *adap)
 {
-       return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_SMBUS_BLOCK_DATA;
+       struct mlxcpld_i2c_priv *priv = i2c_get_adapdata(adap);
+
+       if (priv->smbus_block)
+               return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL |
+                       I2C_FUNC_SMBUS_I2C_BLOCK | I2C_FUNC_SMBUS_BLOCK_DATA;
+       else
+               return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL |
+                       I2C_FUNC_SMBUS_I2C_BLOCK;
 }
 
 static const struct i2c_algorithm mlxcpld_i2c_algo = {