Merge "defconfig: Enable bluetooth for sdxprairie" (debedf63) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm/configs/vendor/sdxprairie_defconfig

+7 −2

Original line number	Diff line number	Diff line
		@@ -153,9 +153,16 @@ CONFIG_NET_SCH_PRIO=y
		CONFIG_QRTR=y
		CONFIG_QRTR_SMD=y
		CONFIG_QRTR_MHI=y
		CONFIG_BT=y
		# CONFIG_BT_BREDR is not set
		# CONFIG_BT_LE is not set
		# CONFIG_BT_DEBUGFS is not set
		CONFIG_MSM_BT_POWER=y
		# CONFIG_BTFM_SLIM is not set
		CONFIG_CFG80211=y
		CONFIG_RFKILL=y
		CONFIG_DEVTMPFS=y
		CONFIG_DEVTMPFS_MOUNT=y
		CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y
		CONFIG_DMA_CMA=y
		CONFIG_CMA_SIZE_MBYTES=12
		@@ -444,8 +451,6 @@ CONFIG_HARDENED_USERCOPY=y
		CONFIG_HARDENED_USERCOPY_PAGESPAN=y
		CONFIG_SECURITY_SELINUX=y
		# CONFIG_SECURITY_SELINUX_AVC_STATS is not set
		CONFIG_CRYPTO_CMAC=y
		CONFIG_CRYPTO_SHA256=y
		CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y
		CONFIG_CRYPTO_DEV_QCRYPTO=y
		CONFIG_CRYPTO_DEV_QCEDEV=y

+8 −3

Original line number	Diff line number	Diff line
		@@ -32,7 +32,10 @@
		#include <net/cnss.h>
		#endif

		#ifdef CONFIG_BTFM_SLIM
		#include "btfm_slim.h"
		#endif

		#include <linux/fs.h>

		#define BT_PWR_DBG(fmt, arg...) pr_debug("%s: " fmt "\n", __func__, ## arg)
		@@ -675,6 +678,7 @@ static long bt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
		int chipset_version = 0;

		switch (cmd) {
		#ifdef CONFIG_BTFM_SLIM
		case BT_CMD_SLIM_TEST:
		if (!bt_power_pdata->slim_dev) {
		BT_PWR_ERR("slim_dev is null\n");
		@@ -684,6 +688,7 @@ static long bt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
		bt_power_pdata->slim_dev->platform_data
		);
		break;
		#endif
		case BT_CMD_PWR_CTRL:
		pwr_cntrl = (int)arg;
		BT_PWR_ERR("BT_CMD_PWR_CTRL pwr_cntrl:%d", pwr_cntrl);
		@@ -737,20 +742,20 @@ static int __init bluetooth_power_init(void)

		bt_major = register_chrdev(0, "bt", &bt_dev_fops);
		if (bt_major < 0) {
		BTFMSLIM_ERR("failed to allocate char dev\n");
		BT_PWR_ERR("failed to allocate char dev\n");
		goto chrdev_unreg;
		}

		bt_class = class_create(THIS_MODULE, "bt-dev");
		if (IS_ERR(bt_class)) {
		BTFMSLIM_ERR("coudn't create class");
		BT_PWR_ERR("coudn't create class");
		goto chrdev_unreg;
		}


		if (device_create(bt_class, NULL, MKDEV(bt_major, 0),
		NULL, "btpower") == NULL) {
		BTFMSLIM_ERR("failed to allocate char dev\n");
		BT_PWR_ERR("failed to allocate char dev\n");
		goto chrdev_unreg;
		}
		return 0;