Merge tag 'staging-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-block.git] / Documentation / devicetree / bindings / iio / pressure / bmp085.txt

diff --git a/Documentation/devicetree/bindings/iio/pressure/bmp085.txt b/Documentation/devicetree/bindings/iio/pressure/bmp085.txt
index 5498b0688b6f5b1a562d7f4807c543e1c02a6b5c..61c72e63c58454a53a9478e7e7b5f3ef41f06214 100644 (file)
--- a/Documentation/devicetree/bindings/iio/pressure/bmp085.txt
+++ b/Documentation/devicetree/bindings/iio/pressure/bmp085.txt
@@ -8,10 +8,6 @@ Required properties:
   "bosch,bme280"
 
 Optional properties:
-- chip-id: configurable chip id for non-default chip revisions
-- 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.
 - interrupts: interrupt mapping for IRQ
 - reset-gpios: a GPIO line handling reset of the sensor: as the line is
   active low, it should be marked GPIO_ACTIVE_LOW (see gpio/gpio.txt)
@@ -23,9 +19,6 @@ Example:
 pressure@77 {
        compatible = "bosch,bmp085";
        reg = <0x77>;
-       chip-id = <10>;
-       temp-measurement-period = <100>;
-       default-oversampling = <2>;
        interrupt-parent = <&gpio0>;
        interrupts = <25 IRQ_TYPE_EDGE_RISING>;
        reset-gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;