orangepizero2: fix bluetooth in edge kernel
This commit is contained in:
parent
43a786c327
commit
fe7b8eee12
@ -630,6 +630,7 @@ CONFIG_DW_XDATA_PCIE=m
|
|||||||
CONFIG_NTSYNC=m
|
CONFIG_NTSYNC=m
|
||||||
CONFIG_MISC_RTSX_PCI=m
|
CONFIG_MISC_RTSX_PCI=m
|
||||||
CONFIG_MISC_RTSX_USB=m
|
CONFIG_MISC_RTSX_USB=m
|
||||||
|
CONFIG_SUNXI_ADDR_MGT=m
|
||||||
CONFIG_BLK_DEV_SD=y
|
CONFIG_BLK_DEV_SD=y
|
||||||
CONFIG_CHR_DEV_ST=m
|
CONFIG_CHR_DEV_ST=m
|
||||||
CONFIG_BLK_DEV_SR=m
|
CONFIG_BLK_DEV_SR=m
|
||||||
|
|||||||
@ -4,6 +4,7 @@ After=bluetooth.service
|
|||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=simple
|
||||||
|
ExecStartPre=/sbin/modprobe sunxi_addr
|
||||||
ExecStartPre=/usr/sbin/rfkill unblock all
|
ExecStartPre=/usr/sbin/rfkill unblock all
|
||||||
ExecStart=/usr/bin/hciattach_opi -s 1500000 /dev/ttyBT0 sprd
|
ExecStart=/usr/bin/hciattach_opi -s 1500000 /dev/ttyBT0 sprd
|
||||||
TimeoutSec=0
|
TimeoutSec=0
|
||||||
|
|||||||
@ -5,14 +5,14 @@ Subject: Fix compilation of uwe5622 in Linux 6.18
|
|||||||
|
|
||||||
Signed-off-by: Werner <werner@armbian.com>
|
Signed-off-by: Werner <werner@armbian.com>
|
||||||
---
|
---
|
||||||
drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c | 6 ++++--
|
drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c | 2 ++--
|
||||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c
|
diff --git a/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c
|
||||||
index 1558f1c03de0..07dd4528bf12 100644
|
index 1558f1c03de0..07dd4528bf12 100644
|
||||||
--- a/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c
|
--- a/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c
|
||||||
+++ b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c
|
+++ b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c
|
||||||
@@ -1382,12 +1382,14 @@ static int marlin_registsr_bt_wake(struct device *dev)
|
@@ -1382,12 +1382,12 @@ static int marlin_registsr_bt_wake(struct device *dev)
|
||||||
WCN_ERR("bt_hostwake irq is invalid: %d\n",
|
WCN_ERR("bt_hostwake irq is invalid: %d\n",
|
||||||
bt_wake_host_gpio);
|
bt_wake_host_gpio);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
@ -20,10 +20,8 @@ index 1558f1c03de0..07dd4528bf12 100644
|
|||||||
|
|
||||||
- ret = devm_gpio_request(dev, bt_wake_host_gpio,
|
- ret = devm_gpio_request(dev, bt_wake_host_gpio,
|
||||||
- "bt-wake-host-gpio");
|
- "bt-wake-host-gpio");
|
||||||
+ struct gpio_desc *desc = devm_gpiod_get(dev, "bt-wake-host-gpio", GPIOD_OUT_LOW);
|
+ ret = devm_gpio_request_one(dev, bt_wake_host_gpio, GPIOF_IN,
|
||||||
+ if (IS_ERR(desc))
|
+ "bt-wake-host-gpio");
|
||||||
+ return PTR_ERR(desc);
|
|
||||||
+
|
|
||||||
if (ret) {
|
if (ret) {
|
||||||
WCN_ERR("bt-wake-host-gpio request err: %d\n",
|
WCN_ERR("bt-wake-host-gpio request err: %d\n",
|
||||||
bt_wake_host_gpio);
|
bt_wake_host_gpio);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user