diff options
| author | James Morris <james.l.morris@oracle.com> | 2013-04-20 09:00:45 -0700 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2013-04-20 09:00:45 -0700 |
| commit | b7ae9f064bec903bd4a9f257a35da4d1e9bbcc99 (patch) | |
| tree | ce1d1f40a1050f8ed1a3bd33c7ff226e250bf77e /Documentation | |
| parent | df2c2afba4fa867616436364633c7612ccfba84b (diff) | |
| parent | 32d33b29ba077d6b45de35f2181e0a7411b162f4 (diff) | |
Merge branch 'tpmdd-04-17-13' of git://github.com/shpedoikal/linux into my-next
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/trivial-devices.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt index 446859fcdca..ad6a73852f0 100644 --- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt +++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt @@ -35,6 +35,8 @@ fsl,mc13892 MC13892: Power Management Integrated Circuit (PMIC) for i.MX35/51 fsl,mma8450 MMA8450Q: Xtrinsic Low-power, 3-axis Xtrinsic Accelerometer fsl,mpr121 MPR121: Proximity Capacitive Touch Sensor Controller fsl,sgtl5000 SGTL5000: Ultra Low-Power Audio Codec +infineon,slb9635tt Infineon SLB9635 (Soft-) I2C TPM (old protocol, max 100khz) +infineon,slb9645tt Infineon SLB9645 I2C TPM (new protocol, max 400khz) 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 |