diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-21 02:22:19 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-21 02:22:19 +0100 |
| commit | f730cc9fee2b47c22964b4843a41d723f436b62a (patch) | |
| tree | 2296bca3339cbadabcc017b257faf6b7a9140e4e /Documentation | |
| parent | 164a5e7ad531e181334a3d3f03d0d5ad20d6faea (diff) | |
| parent | fac72b243cc789bb209e6eca824919b42d98cfe2 (diff) | |
| download | linux-f730cc9fee2b47c22964b4843a41d723f436b62a.tar.gz linux-f730cc9fee2b47c22964b4843a41d723f436b62a.tar.bz2 linux-f730cc9fee2b47c22964b4843a41d723f436b62a.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2017-10-19
Here's the first bluetooth-next pull request targeting the 4.15 kernel
release.
- Multiple fixes & improvements to the hci_bcm driver
- DT improvements, e.g. new local-bd-address property
- Fixes & improvements to ECDH usage. Private key is now generated by
the crypto subsystem.
- gcc-4.9 warning fixes
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/bluetooth.txt | 5 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/bluetooth.txt b/Documentation/devicetree/bindings/net/bluetooth.txt new file mode 100644 index 000000000000..94797df751b8 --- /dev/null +++ b/Documentation/devicetree/bindings/net/bluetooth.txt @@ -0,0 +1,5 @@ +The following properties are common to the Bluetooth controllers: + +- local-bd-address: array of 6 bytes, specifies the BD address that was + uniquely assigned to the Bluetooth device, formatted with least significant + byte first (little-endian). diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt b/Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt index 4ea39e9186a7..042a2e4159bd 100644 --- a/Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt @@ -37,6 +37,11 @@ The following properties are defined to the bluetooth node: Definition: must be: "qcom,wcnss-bt" +- local-bd-address: + Usage: optional + Value type: <u8 array> + Definition: see Documentation/devicetree/bindings/net/bluetooth.txt + == WiFi The following properties are defined to the WiFi node: @@ -91,6 +96,9 @@ smd { bt { compatible = "qcom,wcnss-bt"; + + /* BD address 00:11:22:33:44:55 */ + local-bd-address = [ 55 44 33 22 11 00 ]; }; wlan { |