diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-07 09:16:41 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-07 09:16:40 -0800 |
| commit | b02928f9da8443672d7c4953c2a79ba445fb3e7a (patch) | |
| tree | c44a99ab4d0a46da2708193218c7cd47e4fe1b57 /include/linux | |
| parent | 1ccffb8bdd8c4f74972d465e7fa46dbb90072f50 (diff) | |
| parent | 3c4344e1f9310dece79a7e788551e1c921806f84 (diff) | |
Merge "i2c-msm-v2: Replace HW recovery mechanism with SW bit-banging"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/i2c/i2c-msm-v2.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/i2c/i2c-msm-v2.h b/include/linux/i2c/i2c-msm-v2.h index 3ba9289549a2..26cd52644f8d 100644 --- a/include/linux/i2c/i2c-msm-v2.h +++ b/include/linux/i2c/i2c-msm-v2.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2015,2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2014-2015,2017-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -201,7 +201,6 @@ enum i2c_msm_power_state { #define I2C_MSM_MAX_POLL_MSEC (100) #define I2C_MSM_TIMEOUT_SAFTY_COEF (10) #define I2C_MSM_TIMEOUT_MIN_USEC (500000) -#define I2C_QUP_MAX_BUS_RECOVERY_RETRY (10) /* QUP v2 tags */ #define QUP_TAG2_DATA_WRITE (0x82ULL) |