diff options
author | David S. Miller | 2019-11-12 19:29:57 -0800 |
---|---|---|
committer | David S. Miller | 2019-11-12 19:29:57 -0800 |
commit | ce9db46436960fa3fb30db0eb50c4e4dde8c9530 (patch) | |
tree | b1c2ebaf81910763fd04a9e0f2877e0c1dd1fdf8 /Documentation | |
parent | e0580b50d9d4b61d6c56085acdc2bb01c040aca9 (diff) | |
parent | 7d250a062f75e6ee8368b64ac6ff1e09fbb6783d (diff) |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: linux-bluetooth 2019-11-11
Here's one more bluetooth-next pull request for the 5.5 kernel release.
- Several fixes for LE advertising
- Added PM support to hci_qca driver
- Added support for WCN3991 SoC in hci_qca driver
- Added DT bindings for BCM43540 module
- A few other small cleanups/fixes
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/net/broadcom-bluetooth.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/broadcom-bluetooth.txt b/Documentation/devicetree/bindings/net/broadcom-bluetooth.txt index 4fa00e2eafcf..c749dc297624 100644 --- a/Documentation/devicetree/bindings/net/broadcom-bluetooth.txt +++ b/Documentation/devicetree/bindings/net/broadcom-bluetooth.txt @@ -14,6 +14,7 @@ Required properties: * "brcm,bcm4330-bt" * "brcm,bcm43438-bt" * "brcm,bcm4345c5" + * "brcm,bcm43540-bt" Optional properties: |