Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[firefly-linux-kernel-4.4.55.git] / Documentation / devicetree / bindings / i2c / trivial-devices.txt

diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
index ad0c4ac916dd75ed0b7eb07e28b3c62e60f3d725..00f8652e193a940cab80cd6bf91b8127cdecd547 100644 (file)
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -19,8 +19,7 @@ adi,adt7475           +/-1C TDM Extended Temp Range I.C
 adi,adt7476            +/-1C TDM Extended Temp Range I.C
 adi,adt7490            +/-1C TDM Extended Temp Range I.C
 adi,adxl345            Three-Axis Digital Accelerometer
-adi,adxl346            Three-Axis Digital Accelerometer
-adi,adxl34x            Three-Axis Digital Accelerometer
+adi,adxl346            Three-Axis Digital Accelerometer (backward-compatibility value "adi,adxl345" must be listed too)
 at,24c08               i2c serial eeprom  (24cxx)
 atmel,24c00            i2c serial eeprom  (24cxx)
 atmel,24c01            i2c serial eeprom  (24cxx)