Merge "Bluetooth: Add support to get chipset version from device tree" (6726b022) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/bluetooth/btpower.c

+44 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include <linux/slab.h>
		#include <linux/regulator/consumer.h>
		#include <linux/clk.h>
		#include <linux/uaccess.h>
		#include <linux/btpower.h>

		#if defined CONFIG_BT_SLIM_QCA6390 \|\| \
		@@ -50,6 +51,7 @@ static struct bt_power_vreg_data bt_power_vreg_info[] = {
		static int bt_power_vreg_get(struct platform_device *pdev);
		static int bt_power_vreg_set(enum bt_power_modes mode);
		static void bt_power_vreg_put(void);
		static int bt_dt_parse_chipset_info(struct device *dev);

		static struct bluetooth_power_platform_data *bt_power_pdata;
		static struct platform_device *btpdev;
		@@ -460,6 +462,30 @@ static int bt_dt_parse_clk_info(struct device *dev,
		return ret;
		}

		static int bt_dt_parse_chipset_info(struct device *dev)
		{
		int ret = -EINVAL;
		struct device_node *np = dev->of_node;

		/* Allocated 32 byte size buffer for compatible string */
		bt_power_pdata->compatible_chipset_version = devm_kzalloc(dev,
		MAX_PROP_SIZE, GFP_KERNEL);
		if (bt_power_pdata->compatible_chipset_version == NULL) {
		ret = -ENOMEM;
		return ret;
		}
		ret = of_property_read_string(np, "compatible",
		&bt_power_pdata->compatible_chipset_version);
		if (ret < 0) {
		pr_err("%s: reading \"compatible\" failed\n",
		__func__);
		} else {
		pr_debug("%s: compatible =%s\n", __func__,
		bt_power_pdata->compatible_chipset_version);
		}
		return ret;
		}

		static int bt_power_vreg_get(struct platform_device *pdev)
		{
		struct bt_power_vreg_data *vreg_info;
		@@ -568,6 +594,10 @@ static int bt_power_populate_dt_pinfo(struct platform_device *pdev)
		if (rc < 0)
		pr_err("%s: clock not provided in device tree\n",
		__func__);
		rc = bt_dt_parse_chipset_info(&pdev->dev);
		if (rc < 0)
		pr_err("%s: compatible not provided in device tree\n",
		__func__);
		}

		bt_power_pdata->bt_power_setup = bluetooth_power;
		@@ -693,10 +723,23 @@ static long bt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
		if (chipset_version) {
		soc_id = chipset_version;
		} else {
		pr_err("%s: got invalid soc version\n");
		pr_err("%s: got invalid soc version\n", __func__);
		soc_id = 0;
		}
		break;
		case BT_CMD_GET_CHIPSET_ID:
		if (bt_power_pdata->compatible_chipset_version) {
		if (copy_to_user((void __user *)arg,
		bt_power_pdata->compatible_chipset_version,
		MAX_PROP_SIZE)) {
		pr_err("%s: copy to user failed\n", __func__);
		ret = -EFAULT;
		}
		} else {
		pr_err("%s: compatible string not valid\n", __func__);
		ret = -EINVAL;
		}
		break;
		default:
		return -ENOIOCTLCMD;
		}

include/linux/btpower.h

+3 −1

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only */
		/*
		* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
		*/

		#ifndef __LINUX_BLUETOOTH_POWER_H
		@@ -43,6 +43,7 @@ struct bluetooth_power_platform_data {
		struct bt_power_vreg_data vreg_info; / VDDIO voltage regulator */
		struct bt_power_clk_data bt_chip_clk; / bluetooth reference clock */
		int (bt_power_setup)(int id); / Bluetooth power setup function */
		const char compatible_chipset_version; /Bluetooth chipset version */
		};

		int btpower_register_slimdev(struct device *dev);
		@@ -51,4 +52,5 @@ int btpower_get_chipset_version(void);
		#define BT_CMD_SLIM_TEST 0xbfac
		#define BT_CMD_PWR_CTRL 0xbfad
		#define BT_CMD_CHIPSET_VERS 0xbfae
		#define BT_CMD_GET_CHIPSET_ID 0xbfaf
		#endif /* __LINUX_BLUETOOTH_POWER_H */