Bluetooth: hci_qca: fix QCA6390 support on non-DT platforms
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Wed, 31 Jul 2024 15:20:49 +0000 (17:20 +0200)
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Wed, 7 Aug 2024 20:35:37 +0000 (16:35 -0400)
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: 9a15ce685706 ("Bluetooth: qca: use the power sequencer for QCA6390")
Reported-by: Wren Turkal <wt@penguintechs.org>
Closes: https://lore.kernel.org/linux-bluetooth/27e6a6c5-fb63-4219-be0b-eefa2c116e06@penguintechs.org/
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
drivers/bluetooth/hci_qca.c

index a20dd501534633cea00c7c719d87e3cae5a33812..2baed7d0f4799d3a745b33186930c79dd77399c2 100644 (file)
@@ -2412,11 +2412,14 @@ static int qca_serdev_probe(struct serdev_device *serdev)
                break;
 
        case QCA_QCA6390:
-               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;
+               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",