diff options
Diffstat (limited to 'drivers/i2c/busses/i2c-nvidia-gpu.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-nvidia-gpu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c index 8822357bca0c..e99c3bb58351 100644 --- a/drivers/i2c/busses/i2c-nvidia-gpu.c +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c | |||
| @@ -89,7 +89,7 @@ static int gpu_i2c_check_status(struct gpu_i2c_dev *i2cd) | |||
| 89 | 89 | ||
| 90 | if (time_is_before_jiffies(target)) { | 90 | if (time_is_before_jiffies(target)) { |
| 91 | dev_err(i2cd->dev, "i2c timeout error %x\n", val); | 91 | dev_err(i2cd->dev, "i2c timeout error %x\n", val); |
| 92 | return -ETIME; | 92 | return -ETIMEDOUT; |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | val = readl(i2cd->regs + I2C_MST_CNTL); | 95 | val = readl(i2cd->regs + I2C_MST_CNTL); |
| @@ -97,9 +97,9 @@ static int gpu_i2c_check_status(struct gpu_i2c_dev *i2cd) | |||
| 97 | case I2C_MST_CNTL_STATUS_OKAY: | 97 | case I2C_MST_CNTL_STATUS_OKAY: |
| 98 | return 0; | 98 | return 0; |
| 99 | case I2C_MST_CNTL_STATUS_NO_ACK: | 99 | case I2C_MST_CNTL_STATUS_NO_ACK: |
| 100 | return -EIO; | 100 | return -ENXIO; |
| 101 | case I2C_MST_CNTL_STATUS_TIMEOUT: | 101 | case I2C_MST_CNTL_STATUS_TIMEOUT: |
| 102 | return -ETIME; | 102 | return -ETIMEDOUT; |
| 103 | default: | 103 | default: |
| 104 | return 0; | 104 | return 0; |
| 105 | } | 105 | } |
| @@ -218,6 +218,7 @@ stop: | |||
| 218 | 218 | ||
| 219 | static const struct i2c_adapter_quirks gpu_i2c_quirks = { | 219 | static const struct i2c_adapter_quirks gpu_i2c_quirks = { |
| 220 | .max_read_len = 4, | 220 | .max_read_len = 4, |
| 221 | .max_comb_2nd_msg_len = 4, | ||
| 221 | .flags = I2C_AQ_COMB_WRITE_THEN_READ, | 222 | .flags = I2C_AQ_COMB_WRITE_THEN_READ, |
| 222 | }; | 223 | }; |
| 223 | 224 | ||
