Bluetooth: hci_qca: Enable WBS support for wcn3991 (a228f7a4) · Commits · 戴 / test

drivers/bluetooth/hci_qca.c

+17 −6

Original line number	Diff line number	Diff line
		@@ -75,6 +75,9 @@ enum qca_flags {
		QCA_HW_ERROR_EVENT
		};

		enum qca_capabilities {
		QCA_CAP_WIDEBAND_SPEECH = BIT(0),
		};

		/* HCI_IBS transmit side sleep protocol states */
		enum tx_ibs_states {
		@@ -187,10 +190,11 @@ struct qca_vreg {
		unsigned int load_uA;
		};

		struct qca_vreg_data {
		struct qca_device_data {
		enum qca_btsoc_type soc_type;
		struct qca_vreg *vregs;
		size_t num_vregs;
		uint32_t capabilities;
		};

		/*
		@@ -1691,7 +1695,7 @@ static const struct hci_uart_proto qca_proto = {
		.dequeue = qca_dequeue,
		};

		static const struct qca_vreg_data qca_soc_data_wcn3990 = {
		static const struct qca_device_data qca_soc_data_wcn3990 = {
		.soc_type = QCA_WCN3990,
		.vregs = (struct qca_vreg []) {
		{ "vddio", 15000 },
		@@ -1702,7 +1706,7 @@ static const struct qca_vreg_data qca_soc_data_wcn3990 = {
		.num_vregs = 4,
		};

		static const struct qca_vreg_data qca_soc_data_wcn3991 = {
		static const struct qca_device_data qca_soc_data_wcn3991 = {
		.soc_type = QCA_WCN3991,
		.vregs = (struct qca_vreg []) {
		{ "vddio", 15000 },
		@@ -1711,9 +1715,10 @@ static const struct qca_vreg_data qca_soc_data_wcn3991 = {
		{ "vddch0", 450000 },
		},
		.num_vregs = 4,
		.capabilities = QCA_CAP_WIDEBAND_SPEECH,
		};

		static const struct qca_vreg_data qca_soc_data_wcn3998 = {
		static const struct qca_device_data qca_soc_data_wcn3998 = {
		.soc_type = QCA_WCN3998,
		.vregs = (struct qca_vreg []) {
		{ "vddio", 10000 },
		@@ -1724,7 +1729,7 @@ static const struct qca_vreg_data qca_soc_data_wcn3998 = {
		.num_vregs = 4,
		};

		static const struct qca_vreg_data qca_soc_data_qca6390 = {
		static const struct qca_device_data qca_soc_data_qca6390 = {
		.soc_type = QCA_QCA6390,
		.num_vregs = 0,
		};
		@@ -1860,7 +1865,7 @@ static int qca_serdev_probe(struct serdev_device *serdev)
		{
		struct qca_serdev *qcadev;
		struct hci_dev *hdev;
		const struct qca_vreg_data *data;
		const struct qca_device_data *data;
		int err;
		bool power_ctrl_enabled = true;

		@@ -1948,6 +1953,12 @@ static int qca_serdev_probe(struct serdev_device *serdev)
		hdev->shutdown = qca_power_off;
		}

		/* Wideband speech support must be set per driver since it can't be
		* queried via hci.
		*/
		if (data && (data->capabilities & QCA_CAP_WIDEBAND_SPEECH))
		set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks);

		return 0;
		}

Admin message