Commit f3660957 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: hci_qca: fix QCA6390 support on non-DT platforms 



QCA6390 can albo be used on non-DT systems so we must not make the power
sequencing the only option. Check if the serdev device consumes an OF
node. If so: honor the new contract as per the DT bindings. If not: fall
back to the previous behavior by falling through to the existing
default label.

Fixes: 9a15ce68 ("Bluetooth: qca: use the power sequencer for QCA6390")
Reported-by: default avatarWren Turkal <wt@penguintechs.org>
Closes: https://lore.kernel.org/linux-bluetooth/27e6a6c5-fb63-4219-be0b-eefa2c116e06@penguintechs.org/


Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarPaul Menzel <pmenzel@molgen.mpg.de>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 541b8021

drivers/bluetooth/hci_qca.c

+8 −5
Original line number Diff line number Diff line
@@ -2412,11 +2412,14 @@ static int qca_serdev_probe(struct serdev_device *serdev) 
		break;



	case QCA_QCA6390:

		if (dev_of_node(&serdev->dev)) {

			qcadev->bt_power->pwrseq = devm_pwrseq_get(&serdev->dev,

								   "bluetooth");

			if (IS_ERR(qcadev->bt_power->pwrseq))

				return PTR_ERR(qcadev->bt_power->pwrseq);

			break;

		}

		fallthrough;



	default:

		qcadev->bt_en = devm_gpiod_get_optional(&serdev->dev, "enable",