summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-06-08 12:48:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-06-08 12:48:49 -0700
commit902b2edfca34f88b04b86e605087e200e7e79880 (patch)
tree2b77ff62326a43cb2115cd5f5874727c118962b6
parent66b59f2b5e48969de862908c2d32c8b3d3724738 (diff)
parent8f77293cca1f5116edc98d7a0e36c6da3917fc08 (diff)
downloadlwn-902b2edfca34f88b04b86e605087e200e7e79880.tar.gz
lwn-902b2edfca34f88b04b86e605087e200e7e79880.zip
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang: "I2C has a driver bugfix and a MAINTAINERS fix" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: MAINTAINERS: Karthikeyan Ramasubramanian is MIA i2c: xiic: Add max_read_len quirk
-rw-r--r--MAINTAINERS1
-rw-r--r--drivers/i2c/busses/i2c-xiic.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index df83b6769c17..57f496cff999 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13057,7 +13057,6 @@ F: Documentation/devicetree/bindings/net/qcom,dwmac.txt
QUALCOMM GENERIC INTERFACE I2C DRIVER
M: Alok Chauhan <alokc@codeaurora.org>
-M: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
L: linux-i2c@vger.kernel.org
L: linux-arm-msm@vger.kernel.org
S: Supported
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index 0fea7c54f788..37b3b9307d07 100644
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -709,11 +709,16 @@ static const struct i2c_algorithm xiic_algorithm = {
.functionality = xiic_func,
};
+static const struct i2c_adapter_quirks xiic_quirks = {
+ .max_read_len = 255,
+};
+
static const struct i2c_adapter xiic_adapter = {
.owner = THIS_MODULE,
.name = DRIVER_NAME,
.class = I2C_CLASS_DEPRECATED,
.algo = &xiic_algorithm,
+ .quirks = &xiic_quirks,
};