Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/bluetooth/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -108,10 +108,10 @@ config BT_HCIUART_NOKIA 
	tristate "UART Nokia H4+ protocol support"

	depends on BT_HCIUART

	depends on BT_HCIUART_SERDEV

	depends on GPIOLIB

	depends on PM

	select BT_HCIUART_H4

	select BT_BCM

	select GPIOLIB

	help

	  Nokia H4+ is serial protocol for communication between Bluetooth

	  device and host. This protocol is required for Bluetooth devices
@@ -170,9 +170,9 @@ config BT_HCIUART_3WIRE 
config BT_HCIUART_INTEL

	bool "Intel protocol support"

	depends on BT_HCIUART

	depends on GPIOLIB

	select BT_HCIUART_H4

	select BT_INTEL

	select GPIOLIB

	help

	  The Intel protocol support enables Bluetooth HCI over serial

	  port interface for Intel Bluetooth controllers.
@@ -184,9 +184,9 @@ config BT_HCIUART_BCM 
	depends on BT_HCIUART

	depends on BT_HCIUART_SERDEV

	depends on (!ACPI || SERIAL_DEV_CTRL_TTYPORT)

	depends on GPIOLIB

	select BT_HCIUART_H4

	select BT_BCM

	select GPIOLIB

	help

	  The Broadcom protocol support enables Bluetooth HCI over serial

	  port interface for Broadcom Bluetooth controllers.