Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...

[cascardo/linux.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 0bc11e0..1416c6a 100644 (file)
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -57,6 +57,7 @@ maxim,ds1050          5 Bit Programmable, Pulse-Width Modulator
 maxim,max1237          Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs
 maxim,max6625          9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface
 mc,rv3029c2            Real Time Clock Module with I2C-Bus
+mcube,mc3230           mCube 3-axis 8-bit digital accelerometer
 microchip,mcp4531-502  Microchip 7-bit Single I2C Digital Potentiometer (5k)
 microchip,mcp4531-103  Microchip 7-bit Single I2C Digital Potentiometer (10k)
 microchip,mcp4531-503  Microchip 7-bit Single I2C Digital Potentiometer (50k)
@@ -127,6 +128,7 @@ national,lm80               Serial Interface ACPI-Compatible Microprocessor System Hardware M
 national,lm85          Temperature sensor with integrated fan control
 national,lm92          ±0.33°C Accurate, 12-Bit + Sign Temperature Sensor and Thermal Window Comparator with Two-Wire Interface
 nuvoton,npct501                i2c trusted platform module (TPM)
+nuvoton,npct601                i2c trusted platform module (TPM2)
 nxp,pca9556            Octal SMBus and I2C registered interface
 nxp,pca9557            8-bit I2C-bus and SMBus I/O port with reset
 nxp,pcf8563            Real-time clock/calendar
@@ -146,10 +148,10 @@ samsung,24ad0xd1  S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power)
 sgx,vz89x              SGX Sensortech VZ89X Sensors
 sii,s35390a            2-wire CMOS real-time clock
 skyworks,sky81452      Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply
-st-micro,24c256                i2c serial eeprom  (24cxx)
-stm,m41t00             Serial Access TIMEKEEPER
-stm,m41t62             Serial real-time clock (RTC) with alarm
-stm,m41t80             M41T80 - SERIAL ACCESS RTC WITH ALARMS
+st,24c256              i2c serial eeprom  (24cxx)
+st,m41t00              Serial real-time clock (RTC)
+st,m41t62              Serial real-time clock (RTC) with alarm
+st,m41t80              M41T80 - SERIAL ACCESS RTC WITH ALARMS
 taos,tsl2550           Ambient Light Sensor with SMBUS/Two Wire Serial Interface
 ti,ads7828             8-Channels, 12-bit ADC
 ti,ads7830             8-Channels, 8-bit ADC