summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-12-09 19:01:27 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-09 19:01:27 -0800
commit407f3fd8faf80f77c47ebda7501c6a8698d2f3a6 (patch)
tree3b41623f7174f1bee5b31853d2b295028cf9e376 /Documentation
parentdc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff)
parent1d06825b0ede541f63b5577435abd2fc649a9b5e (diff)
downloadop-kernel-dev-407f3fd8faf80f77c47ebda7501c6a8698d2f3a6.zip
op-kernel-dev-407f3fd8faf80f77c47ebda7501c6a8698d2f3a6.tar.gz
Merge 3.2-rc5 into staging-next
This resolves the conflict in the drivers/staging/iio/industrialio-core.c file due to two different changes made to resolve the same problem. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/nvec/nvec_nvidia.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/nvec/nvec_nvidia.txt b/Documentation/devicetree/bindings/nvec/nvec_nvidia.txt
new file mode 100644
index 0000000..5aeee53
--- /dev/null
+++ b/Documentation/devicetree/bindings/nvec/nvec_nvidia.txt
@@ -0,0 +1,9 @@
+NVIDIA compliant embedded controller
+
+Required properties:
+- compatible : should be "nvidia,nvec".
+- reg : the iomem of the i2c slave controller
+- interrupts : the interrupt line of the i2c slave controller
+- clock-frequency : the frequency of the i2c bus
+- gpios : the gpio used for ec request
+- slave-addr: the i2c address of the slave controller
OpenPOWER on IntegriCloud