diff options
| author | David S. Miller <davem@davemloft.net> | 2021-02-12 01:59:01 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-02-12 01:59:01 +0300 |
| commit | 0ae20159e88fece0e5f1e71fe1e5a62427f73b41 (patch) | |
| tree | 6270e34e39155e40a160c0fda473d4a54757c00d /Documentation | |
| parent | 1d1311516a5d104eed3f0983e111bd1aaeb00543 (diff) | |
| parent | 55c0bd77479b60ea29fd390faf4545cfb3a1d79e (diff) | |
| download | linux-0ae20159e88fece0e5f1e71fe1e5a62427f73b41.tar.xz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kern
el/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2021-02-11
Here's the main bluetooth-next pull request for 5.12:
- Add support for advertising monitor offliading using Microsoft
vendor extensions
- Add firmware download support for MediaTek MT7921U USB devices
- Suspend-related fixes for Qualcomm devices
- Add support for Intel GarfieldPeak controller
- Various other smaller fixes & cleanups
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/net/btusb.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/btusb.txt b/Documentation/devicetree/bindings/net/btusb.txt index b1ad6ee68e90..c51dd99dc0d3 100644 --- a/Documentation/devicetree/bindings/net/btusb.txt +++ b/Documentation/devicetree/bindings/net/btusb.txt @@ -38,7 +38,7 @@ Following example uses irq pin number 3 of gpio0 for out of band wake-on-bt: compatible = "usb1286,204e"; reg = <1>; interrupt-parent = <&gpio0>; - interrupt-name = "wakeup"; + interrupt-names = "wakeup"; interrupts = <3 IRQ_TYPE_LEVEL_LOW>; }; }; |