diff options
| author | Michael Ellerman | 2016-12-16 05:05:38 +0100 |
|---|---|---|
| committer | Michael Ellerman | 2016-12-16 05:05:38 +0100 |
| commit | c6f6634721c871bfab4235e1cbcad208d3063798 (patch) | |
| tree | 9cc1d0307b9c5a3a84021419d5f80bea8bbfc49e /Documentation | |
| parent | powerpc/boot: Request no dynamic linker for boot wrapper (diff) | |
| parent | powerpc/fsl/dts: add FMan node for t1042d4rdb (diff) | |
| download | kernel-qcow2-linux-c6f6634721c871bfab4235e1cbcad208d3063798.tar.gz kernel-qcow2-linux-c6f6634721c871bfab4235e1cbcad208d3063798.tar.xz kernel-qcow2-linux-c6f6634721c871bfab4235e1cbcad208d3063798.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include 8xx hugepage support, qbman fixes/cleanup, device
tree updates, and some misc cleanup."
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/trivial-devices.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt index fbbad6446741..c65aff0edf56 100644 --- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt +++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt @@ -158,4 +158,5 @@ ti,tsc2003 I2C Touch-Screen Controller ti,tmp102 Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface ti,tmp103 Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface ti,tmp275 Digital Temperature Sensor +winbond,w83793 Winbond/Nuvoton H/W Monitor winbond,wpct301 i2c trusted platform module (TPM) |