Merge v3.13-rc6 into char-misc-next

[firefly-linux-kernel-4.4.55.git] / Documentation / devicetree / bindings / misc / bmp085.txt

diff --git a/Documentation/devicetree/bindings/misc/bmp085.txt b/Documentation/devicetree/bindings/misc/bmp085.txt
index 91dfda2e4e11907291e81af51355939064b7d0e1..d7a6deb6b21e3d2e29d47a73081acaf4463d4d5e 100644 (file)
--- a/Documentation/devicetree/bindings/misc/bmp085.txt
+++ b/Documentation/devicetree/bindings/misc/bmp085.txt
@@ -8,6 +8,8 @@ Optional properties:
 - temp-measurement-period: temperature measurement period (milliseconds)
 - default-oversampling: default oversampling value to be used at startup,
   value range is 0-3 with rising sensitivity.
+- interrupt-parent: should be the phandle for the interrupt controller
+- interrupts: interrupt mapping for IRQ
 
 Example:
 
@@ -17,4 +19,6 @@ pressure@77 {
        chip-id = <10>;
        temp-measurement-period = <100>;
        default-oversampling = <2>;
+       interrupt-parent = <&gpio0>;
+       interrupts = <25 IRQ_TYPE_EDGE_RISING>;
 };