projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-tee' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6-block.git]
/
arch
/
arm64
/
boot
/
dts
/
hisilicon
/
hi6220-hikey.dts
diff --git
a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index 89c15399bec2dc49559438c54bcbae1dd84e3a85..75bce2d0b1a83fa9f953b55a75ebdcb2ff4dc526 100644
(file)
--- a/
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@
-98,6
+98,11
@@
assigned-clocks = <&sys_ctrl HI6220_UART1_SRC>;
assigned-clock-rates = <150000000>;
status = "ok";
+
+ bluetooth {
+ compatible = "ti,wl1835-st";
+ enable-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
+ };
};
uart2: uart@f7112000 {