Commit a3a446c7 authored by Lukas Wunner's avatar Lukas Wunner Committed by Marcel Holtmann

Bluetooth: Depend on rather than select GPIOLIB

Commit 27378f4c ("Bluetooth: Avoid WARN splat due to missing
GPIOLIB") amended Kconfig to select GPIOLIB if BT_HCIUART_NOKIA,
BT_HCIUART_INTEL or BT_HCIUART_BCM is enabled since all three drivers
require it to function.

The diagnosis was correct but the treatment was not.  As stated in
Documentation/gpio/consumer.txt:

    Guidelines for GPIOs consumers
    ==============================

    Drivers that can't work without standard GPIO calls should have
    Kconfig entries that depend on GPIOLIB.
                         ^^^^^^^^^
Fix it.
Reported-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent b71b25fe
...@@ -108,10 +108,10 @@ config BT_HCIUART_NOKIA ...@@ -108,10 +108,10 @@ config BT_HCIUART_NOKIA
tristate "UART Nokia H4+ protocol support" tristate "UART Nokia H4+ protocol support"
depends on BT_HCIUART depends on BT_HCIUART
depends on BT_HCIUART_SERDEV depends on BT_HCIUART_SERDEV
depends on GPIOLIB
depends on PM depends on PM
select BT_HCIUART_H4 select BT_HCIUART_H4
select BT_BCM select BT_BCM
select GPIOLIB
help help
Nokia H4+ is serial protocol for communication between Bluetooth Nokia H4+ is serial protocol for communication between Bluetooth
device and host. This protocol is required for Bluetooth devices device and host. This protocol is required for Bluetooth devices
...@@ -170,9 +170,9 @@ config BT_HCIUART_3WIRE ...@@ -170,9 +170,9 @@ config BT_HCIUART_3WIRE
config BT_HCIUART_INTEL config BT_HCIUART_INTEL
bool "Intel protocol support" bool "Intel protocol support"
depends on BT_HCIUART depends on BT_HCIUART
depends on GPIOLIB
select BT_HCIUART_H4 select BT_HCIUART_H4
select BT_INTEL select BT_INTEL
select GPIOLIB
help help
The Intel protocol support enables Bluetooth HCI over serial The Intel protocol support enables Bluetooth HCI over serial
port interface for Intel Bluetooth controllers. port interface for Intel Bluetooth controllers.
...@@ -184,9 +184,9 @@ config BT_HCIUART_BCM ...@@ -184,9 +184,9 @@ config BT_HCIUART_BCM
depends on BT_HCIUART depends on BT_HCIUART
depends on BT_HCIUART_SERDEV depends on BT_HCIUART_SERDEV
depends on (!ACPI || SERIAL_DEV_CTRL_TTYPORT) depends on (!ACPI || SERIAL_DEV_CTRL_TTYPORT)
depends on GPIOLIB
select BT_HCIUART_H4 select BT_HCIUART_H4
select BT_BCM select BT_BCM
select GPIOLIB
help help
The Broadcom protocol support enables Bluetooth HCI over serial The Broadcom protocol support enables Bluetooth HCI over serial
port interface for Broadcom Bluetooth controllers. port interface for Broadcom Bluetooth controllers.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment