diff --git a/config/kernel/linux-rockchip64-default.config b/config/kernel/linux-rockchip64-default.config index 8c2e2c367..6ab6c901c 100644 --- a/config/kernel/linux-rockchip64-default.config +++ b/config/kernel/linux-rockchip64-default.config @@ -1181,6 +1181,7 @@ CONFIG_BT_HCIUART_H4=y # CONFIG_BT_HCIUART_BCSP is not set CONFIG_BT_HCIUART_ATH3K=y CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y diff --git a/patch/kernel/rk3399-default/04-patch-4.4.156-157.patch b/patch/kernel/rk3399-default/04-patch-4.4.156-157.patch index 45066d89c..2d28f1e48 100644 --- a/patch/kernel/rk3399-default/04-patch-4.4.156-157.patch +++ b/patch/kernel/rk3399-default/04-patch-4.4.156-157.patch @@ -374,18 +374,6 @@ index 9628fa131757..8116cb2fef2d 100644 devslp |= ((dito << PORT_DEVSLP_DITO_OFFSET) | (mdat << PORT_DEVSLP_MDAT_OFFSET) | (deto << PORT_DEVSLP_DETO_OFFSET) | -diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig -index ec6af1595062..4685bd10c473 100644 ---- a/drivers/bluetooth/Kconfig -+++ b/drivers/bluetooth/Kconfig -@@ -125,6 +125,7 @@ config BT_HCIUART_LL - config BT_HCIUART_3WIRE - bool "Three-wire UART (H5) protocol support" - depends on BT_HCIUART -+ depends on BT_HCIUART_SERDEV - help - The HCI Three-wire UART Transport Layer makes it possible to - user the Bluetooth HCI over a serial port interface. The HCI diff --git a/drivers/crypto/vmx/aes_cbc.c b/drivers/crypto/vmx/aes_cbc.c index 9506e8693c81..d8ef1147b344 100644 --- a/drivers/crypto/vmx/aes_cbc.c diff --git a/patch/kernel/rockchip-default/04-patch-4.4.156-157.patch b/patch/kernel/rockchip-default/04-patch-4.4.156-157.patch index 45066d89c..2d28f1e48 100644 --- a/patch/kernel/rockchip-default/04-patch-4.4.156-157.patch +++ b/patch/kernel/rockchip-default/04-patch-4.4.156-157.patch @@ -374,18 +374,6 @@ index 9628fa131757..8116cb2fef2d 100644 devslp |= ((dito << PORT_DEVSLP_DITO_OFFSET) | (mdat << PORT_DEVSLP_MDAT_OFFSET) | (deto << PORT_DEVSLP_DETO_OFFSET) | -diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig -index ec6af1595062..4685bd10c473 100644 ---- a/drivers/bluetooth/Kconfig -+++ b/drivers/bluetooth/Kconfig -@@ -125,6 +125,7 @@ config BT_HCIUART_LL - config BT_HCIUART_3WIRE - bool "Three-wire UART (H5) protocol support" - depends on BT_HCIUART -+ depends on BT_HCIUART_SERDEV - help - The HCI Three-wire UART Transport Layer makes it possible to - user the Bluetooth HCI over a serial port interface. The HCI diff --git a/drivers/crypto/vmx/aes_cbc.c b/drivers/crypto/vmx/aes_cbc.c index 9506e8693c81..d8ef1147b344 100644 --- a/drivers/crypto/vmx/aes_cbc.c diff --git a/patch/kernel/rockchip64-default/04-patch-4.4.156-157.patch b/patch/kernel/rockchip64-default/04-patch-4.4.156-157.patch index 45066d89c..2d28f1e48 100644 --- a/patch/kernel/rockchip64-default/04-patch-4.4.156-157.patch +++ b/patch/kernel/rockchip64-default/04-patch-4.4.156-157.patch @@ -374,18 +374,6 @@ index 9628fa131757..8116cb2fef2d 100644 devslp |= ((dito << PORT_DEVSLP_DITO_OFFSET) | (mdat << PORT_DEVSLP_MDAT_OFFSET) | (deto << PORT_DEVSLP_DETO_OFFSET) | -diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig -index ec6af1595062..4685bd10c473 100644 ---- a/drivers/bluetooth/Kconfig -+++ b/drivers/bluetooth/Kconfig -@@ -125,6 +125,7 @@ config BT_HCIUART_LL - config BT_HCIUART_3WIRE - bool "Three-wire UART (H5) protocol support" - depends on BT_HCIUART -+ depends on BT_HCIUART_SERDEV - help - The HCI Three-wire UART Transport Layer makes it possible to - user the Bluetooth HCI over a serial port interface. The HCI diff --git a/drivers/crypto/vmx/aes_cbc.c b/drivers/crypto/vmx/aes_cbc.c index 9506e8693c81..d8ef1147b344 100644 --- a/drivers/crypto/vmx/aes_cbc.c