summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2019-05-03 15:57:36 +0300
committerWolfram Sang <wsa@the-dreams.de>2019-05-03 15:57:36 +0300
commit9a51b86a61214a297cdfc1bb705b7267f9455ae6 (patch)
tree9c25963e8641b3f99a57b1f9e6178a2c04d4f0c3
parent8221324b1af8c8fe033de6d39c9e1bbc53ed9f2c (diff)
parentd333bad1f6f3e0df224db181c991fb8d65bbc2be (diff)
downloadlinux-9a51b86a61214a297cdfc1bb705b7267f9455ae6.tar.xz
Merge tag 'at24-v5.2-updates-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-5.2
at24: updates for linux v5.2 - change my e-mail address - add a new compatible for Renesas R1EX24016 to the DT binding document
-rw-r--r--Documentation/devicetree/bindings/eeprom/at24.txt1
-rw-r--r--MAINTAINERS2
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/eeprom/at24.txt b/Documentation/devicetree/bindings/eeprom/at24.txt
index 0e456bbc1213..22aead844d0f 100644
--- a/Documentation/devicetree/bindings/eeprom/at24.txt
+++ b/Documentation/devicetree/bindings/eeprom/at24.txt
@@ -50,6 +50,7 @@ Required properties:
"nxp,se97b" - the fallback is "atmel,24c02",
"renesas,r1ex24002" - the fallback is "atmel,24c02"
+ "renesas,r1ex24016" - the fallback is "atmel,24c16"
"renesas,r1ex24128" - the fallback is "atmel,24c128"
"rohm,br24t01" - the fallback is "atmel,24c01"
diff --git a/MAINTAINERS b/MAINTAINERS
index e0ce75162e60..3606922c64d7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2567,7 +2567,7 @@ F: include/linux/dmaengine.h
F: include/linux/async_tx.h
AT24 EEPROM DRIVER
-M: Bartosz Golaszewski <brgl@bgdev.pl>
+M: Bartosz Golaszewski <bgolaszewski@baylibre.com>
L: linux-i2c@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
S: Maintained