Merge pull request #666 from Kwiboo/hub-bt

WeTek_Hub: enable built-in bluetooth
This commit is contained in:
Christian Hewitt 2016-08-27 15:13:47 +04:00 committed by GitHub
commit b6803fabfc
3 changed files with 25 additions and 1 deletions

View File

@ -5,6 +5,7 @@
ACTION!="add", GOTO="end"
SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x02d0", ATTRS{device}=="0xa962", GOTO="begin"
SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x02d0", ATTRS{device}=="0x4330", GOTO="begin"
SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x02d0", ATTRS{device}=="0x4335", GOTO="begin"
GOTO="end"
LABEL="begin"
### Broadcom bcm43362/bcm20710a1 bluetooth device
@ -15,6 +16,10 @@ ATTRS{vendor}=="0x02d0", ATTRS{device}=="0xa962", \
ATTRS{vendor}=="0x02d0", ATTRS{device}=="0x4330", \
ENV{brcm_device}="bcm40183b2"
### Broadcom bcm4335/bcm4335c0 bluetooth device
ATTRS{vendor}=="0x02d0", ATTRS{device}=="0x4335", \
ENV{brcm_device}="bcm4335c0"
ENV{brcm_device}=="bcm*", ACTION=="add", \
TAG+="systemd", ENV{SYSTEMD_WANTS}+="brcmfmac_sdio-firmware@$env{brcm_device}.service"
LABEL="end"

View File

@ -757,8 +757,12 @@ CONFIG_MAC80211_LEDS=y
# CONFIG_MAC80211_MESSAGE_TRACING is not set
# CONFIG_MAC80211_DEBUG_MENU is not set
# CONFIG_WIMAX is not set
# CONFIG_RFKILL is not set
CONFIG_RFKILL=y
CONFIG_RFKILL_PM=y
CONFIG_RFKILL_LEDS=y
# CONFIG_RFKILL_INPUT is not set
# CONFIG_RFKILL_REGULATOR is not set
# CONFIG_RFKILL_GPIO is not set
# CONFIG_NET_9P is not set
# CONFIG_CAIF is not set
# CONFIG_CEPH_LIB is not set
@ -987,6 +991,7 @@ CONFIG_GXBB_POWER_RESET=y
#
# Amlogic Bt Rfkill Driver
#
CONFIG_BT_DEVICE=y
# CONFIG_BLUESLEEP is not set
#
@ -1484,6 +1489,7 @@ CONFIG_USB_NET_RNDIS_HOST=m
# CONFIG_USB_NET_CX82310_ETH is not set
# CONFIG_USB_NET_KALMIA is not set
# CONFIG_USB_NET_QMI_WWAN is not set
# CONFIG_USB_HSO is not set
# CONFIG_USB_NET_INT51X1 is not set
# CONFIG_USB_IPHETH is not set
# CONFIG_USB_SIERRA_NET is not set
@ -1508,6 +1514,7 @@ CONFIG_ATH9K_AHB=y
# CONFIG_ATH9K_DEBUGFS is not set
# CONFIG_ATH9K_WOW is not set
# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
# CONFIG_ATH9K_RFKILL is not set
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
CONFIG_CARL9170=m

View File

@ -0,0 +1,12 @@
diff --git a/drivers/amlogic/bluetooth/bt_device.c b/drivers/amlogic/bluetooth/bt_device.c
index 6ebd7f2..87d1916 100644
--- a/drivers/amlogic/bluetooth/bt_device.c
+++ b/drivers/amlogic/bluetooth/bt_device.c
@@ -235,6 +235,7 @@ static int bt_probe(struct platform_device *pdev)
register_early_suspend(&bt_early_suspend);
#endif
+ bt_device_on(pdata);
return 0;
err_rfkill: