diff options
author | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-08 09:20:25 -0300 |
---|---|---|
committer | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-08 09:20:25 -0300 |
commit | b115353e00d8f22bb04b0a84b641d0fb18df738f (patch) | |
tree | 8b50c6be40a3fa04a68f781737b2a3d170a4b106 /Documentation | |
parent | 4151687a6d3d0c6454b08b9cbf7bb34971c4fb67 (diff) | |
parent | 820b689b4a7a6ca1b4fdabf26a17196a2e379a97 (diff) |
Merge tag 'v5.15.69' into 5.15-2.1.x-imx
This is the 5.15.69 stable release
Conflicts:
drivers/soc/fsl/Kconfig
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/iio/gyroscope/bosch,bmg160.yaml | 2 | ||||
-rw-r--r-- | Documentation/input/joydev/joystick.rst | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/iio/gyroscope/bosch,bmg160.yaml b/Documentation/devicetree/bindings/iio/gyroscope/bosch,bmg160.yaml index b6bbc312a7cf..1414ba9977c1 100644 --- a/Documentation/devicetree/bindings/iio/gyroscope/bosch,bmg160.yaml +++ b/Documentation/devicetree/bindings/iio/gyroscope/bosch,bmg160.yaml @@ -24,8 +24,10 @@ properties: interrupts: minItems: 1 + maxItems: 2 description: Should be configured with type IRQ_TYPE_EDGE_RISING. + If two interrupts are provided, expected order is INT1 and INT2. required: - compatible diff --git a/Documentation/input/joydev/joystick.rst b/Documentation/input/joydev/joystick.rst index f615906a0821..6d721396717a 100644 --- a/Documentation/input/joydev/joystick.rst +++ b/Documentation/input/joydev/joystick.rst @@ -517,6 +517,7 @@ All I-Force devices are supported by the iforce module. This includes: * AVB Mag Turbo Force * AVB Top Shot Pegasus * AVB Top Shot Force Feedback Racing Wheel +* Boeder Force Feedback Wheel * Logitech WingMan Force * Logitech WingMan Force Wheel * Guillemot Race Leader Force Feedback |