Skip to content

Commit 8a208b2

Browse files
rjliao-qcaholtmann
authored andcommitted
Bluetooth: hci_qca: Make bt_en and susclk not mandatory for QCA Rome
On some platforms the bt_en pin and susclk are default on and there is no exposed resource to control them. This patch makes the bt_en and susclk not mandatory to have BT work. It also will not set the HCI_QUIRK_NON_PERSISTENT_SETUP and shutdown() callback if bt_en is not available. Signed-off-by: Rocky Liao <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
1 parent b638825 commit 8a208b2

File tree

1 file changed

+26
-21
lines changed

1 file changed

+26
-21
lines changed

drivers/bluetooth/hci_qca.c

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1562,9 +1562,11 @@ static int qca_power_on(struct hci_dev *hdev)
15621562
ret = qca_wcn3990_init(hu);
15631563
} else {
15641564
qcadev = serdev_device_get_drvdata(hu->serdev);
1565-
gpiod_set_value_cansleep(qcadev->bt_en, 1);
1566-
/* Controller needs time to bootup. */
1567-
msleep(150);
1565+
if (!IS_ERR(qcadev->bt_en)) {
1566+
gpiod_set_value_cansleep(qcadev->bt_en, 1);
1567+
/* Controller needs time to bootup. */
1568+
msleep(150);
1569+
}
15681570
}
15691571

15701572
return ret;
@@ -1750,7 +1752,7 @@ static void qca_power_shutdown(struct hci_uart *hu)
17501752
host_set_baudrate(hu, 2400);
17511753
qca_send_power_pulse(hu, false);
17521754
qca_regulator_disable(qcadev);
1753-
} else {
1755+
} else if (!IS_ERR(qcadev->bt_en)) {
17541756
gpiod_set_value_cansleep(qcadev->bt_en, 0);
17551757
}
17561758
}
@@ -1852,6 +1854,7 @@ static int qca_serdev_probe(struct serdev_device *serdev)
18521854
struct hci_dev *hdev;
18531855
const struct qca_vreg_data *data;
18541856
int err;
1857+
bool power_ctrl_enabled = true;
18551858

18561859
qcadev = devm_kzalloc(&serdev->dev, sizeof(*qcadev), GFP_KERNEL);
18571860
if (!qcadev)
@@ -1901,35 +1904,37 @@ static int qca_serdev_probe(struct serdev_device *serdev)
19011904
qcadev->bt_en = devm_gpiod_get(&serdev->dev, "enable",
19021905
GPIOD_OUT_LOW);
19031906
if (IS_ERR(qcadev->bt_en)) {
1904-
dev_err(&serdev->dev, "failed to acquire enable gpio\n");
1905-
return PTR_ERR(qcadev->bt_en);
1907+
dev_warn(&serdev->dev, "failed to acquire enable gpio\n");
1908+
power_ctrl_enabled = false;
19061909
}
19071910

19081911
qcadev->susclk = devm_clk_get(&serdev->dev, NULL);
19091912
if (IS_ERR(qcadev->susclk)) {
1910-
dev_err(&serdev->dev, "failed to acquire clk\n");
1911-
return PTR_ERR(qcadev->susclk);
1912-
}
1913-
1914-
err = clk_set_rate(qcadev->susclk, SUSCLK_RATE_32KHZ);
1915-
if (err)
1916-
return err;
1913+
dev_warn(&serdev->dev, "failed to acquire clk\n");
1914+
} else {
1915+
err = clk_set_rate(qcadev->susclk, SUSCLK_RATE_32KHZ);
1916+
if (err)
1917+
return err;
19171918

1918-
err = clk_prepare_enable(qcadev->susclk);
1919-
if (err)
1920-
return err;
1919+
err = clk_prepare_enable(qcadev->susclk);
1920+
if (err)
1921+
return err;
1922+
}
19211923

19221924
err = hci_uart_register_device(&qcadev->serdev_hu, &qca_proto);
19231925
if (err) {
19241926
BT_ERR("Rome serdev registration failed");
1925-
clk_disable_unprepare(qcadev->susclk);
1927+
if (!IS_ERR(qcadev->susclk))
1928+
clk_disable_unprepare(qcadev->susclk);
19261929
return err;
19271930
}
19281931
}
19291932

1930-
hdev = qcadev->serdev_hu.hdev;
1931-
set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks);
1932-
hdev->shutdown = qca_power_off;
1933+
if (power_ctrl_enabled) {
1934+
hdev = qcadev->serdev_hu.hdev;
1935+
set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks);
1936+
hdev->shutdown = qca_power_off;
1937+
}
19331938

19341939
return 0;
19351940
}
@@ -1940,7 +1945,7 @@ static void qca_serdev_remove(struct serdev_device *serdev)
19401945

19411946
if (qca_is_wcn399x(qcadev->btsoc_type))
19421947
qca_power_shutdown(&qcadev->serdev_hu);
1943-
else
1948+
else if (!IS_ERR(qcadev->susclk))
19441949
clk_disable_unprepare(qcadev->susclk);
19451950

19461951
hci_uart_unregister_device(&qcadev->serdev_hu);

0 commit comments

Comments
 (0)