summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/i2c/trivial-devices.txt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-02-03 12:22:18 +0100
committerIngo Molnar <mingo@kernel.org>2015-02-03 12:22:18 +0100
commit8dbcb8737cdd564dd58156b890e567595d8a778d (patch)
tree7768af62c42fd167b95d7b0cf461aab37d61497e /Documentation/devicetree/bindings/i2c/trivial-devices.txt
parent772a9aca12567badb5b9caf2af249a5991f47ea8 (diff)
parente36f014edff70fc02b3d3d79cead1d58f289332e (diff)
downloadlinux-8dbcb8737cdd564dd58156b890e567595d8a778d.tar.bz2
Merge tag 'v3.19-rc7' into x86/asm, to refresh the branch before pulling in new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/i2c/trivial-devices.txt')
-rw-r--r--Documentation/devicetree/bindings/i2c/trivial-devices.txt1
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 9f4e3824e71e..9f41d05be3be 100644
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -47,6 +47,7 @@ dallas,ds3232 Extremely Accurate I²C RTC with Integrated Crystal and SRAM
dallas,ds4510 CPU Supervisor with Nonvolatile Memory and Programmable I/O
dallas,ds75 Digital Thermometer and Thermostat
dlg,da9053 DA9053: flexible system level PMIC with multicore support
+dlg,da9063 DA9063: system PMIC for quad-core application processors
epson,rx8025 High-Stability. I2C-Bus INTERFACE REAL TIME CLOCK MODULE
epson,rx8581 I2C-BUS INTERFACE REAL TIME CLOCK MODULE
fsl,mag3110 MAG3110: Xtrinsic High Accuracy, 3D Magnetometer