diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-14 15:22:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-14 15:22:17 -0400 |
| commit | 4cbf87c78950b439df599053214b09d8f7461765 (patch) | |
| tree | 7d13452d148918dc489eddf82c1e53b2cc4ee8dd /arch | |
| parent | 0331402aeaefe858709b0a4d44ade15f82d3a119 (diff) | |
| parent | 06e41d8a36689f465006f017bbcd8a73edb98109 (diff) | |
| download | linux-4cbf87c78950b439df599053214b09d8f7461765.tar.bz2 | |
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-06-14
Here's another batch of Bluetooth patches for the 4.13 kernel:
- Fix for Broadcom controllers not supporting Event Mask Page 2
- New QCA ROME USB ID for btusb
- Fix for Security Manager Protocol to use constant-time memcmp
- Improved support for TI WiLink chips
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts index 49f6a6242cf9..5cdfe732df38 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts @@ -141,6 +141,8 @@ bluetooth { compatible = "ti,wl1835-st"; enable-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; + clocks = <&pmic>; + clock-names = "ext_clock"; }; }; |