diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-16 10:02:59 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-16 10:02:59 +0300 |
| commit | a30514a076cfe4b1962980e946a759f5556cf4a5 (patch) | |
| tree | bd1238ee26ffaa2940f536da52e77eb576f87549 /Documentation/devicetree/bindings/iio | |
| parent | f805ef1ce5d695c260986fdf2e28f5d6c98cf3a8 (diff) | |
| parent | 7c60610d476766e128cc4284bb6349732cbd6606 (diff) | |
| download | linux-a30514a076cfe4b1962980e946a759f5556cf4a5.tar.xz | |
Merge 5.14-rc6 into staging-next
We need the IIO fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree/bindings/iio')
| -rw-r--r-- | Documentation/devicetree/bindings/iio/st,st-sensors.yaml | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/Documentation/devicetree/bindings/iio/st,st-sensors.yaml b/Documentation/devicetree/bindings/iio/st,st-sensors.yaml index b2a1e42c56fa..71de5631ebae 100644 --- a/Documentation/devicetree/bindings/iio/st,st-sensors.yaml +++ b/Documentation/devicetree/bindings/iio/st,st-sensors.yaml @@ -152,47 +152,6 @@ allOf: maxItems: 1 st,drdy-int-pin: false - - if: - properties: - compatible: - enum: - # Two intertial interrupts i.e. accelerometer/gyro interrupts - - st,h3lis331dl-accel - - st,l3g4200d-gyro - - st,l3g4is-gyro - - st,l3gd20-gyro - - st,l3gd20h-gyro - - st,lis2de12 - - st,lis2dw12 - - st,lis2hh12 - - st,lis2dh12-accel - - st,lis331dl-accel - - st,lis331dlh-accel - - st,lis3de - - st,lis3dh-accel - - st,lis3dhh - - st,lis3mdl-magn - - st,lng2dm-accel - - st,lps331ap-press - - st,lsm303agr-accel - - st,lsm303dlh-accel - - st,lsm303dlhc-accel - - st,lsm303dlm-accel - - st,lsm330-accel - - st,lsm330-gyro - - st,lsm330d-accel - - st,lsm330d-gyro - - st,lsm330dl-accel - - st,lsm330dl-gyro - - st,lsm330dlc-accel - - st,lsm330dlc-gyro - - st,lsm9ds0-gyro - - st,lsm9ds1-magn - then: - properties: - interrupts: - maxItems: 2 - required: - compatible - reg |