Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e683eb97 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: defconfig: Enable CONFIG_BT_SLIM on Lahaina"

parents 4a83585f 5cb193b4

arch/arm64/configs/vendor/lahaina_GKI.config

+6 −0
Original line number Diff line number Diff line
@@ -103,3 +103,9 @@ CONFIG_MSM_ADSPRPC=m 
CONFIG_MSM_CDSP_LOADER=m

CONFIG_UIO_MSM_SHAREDMEM=m

CONFIG_QCOM_SOCINFO=m

CONFIG_BTFM_SLIM=m

# CONFIG_SND_SOC_WCD9335 is not set

# CONFIG_SLIM_QCOM_CTRL is not set

# CONFIG_SLIM_QCOM_NGD_CTRL is not set

# CONFIG_SLIMBUS_MSM_CTRL is not set

# CONFIG_SLIMBUS_MSM_NGD is not set

arch/arm64/configs/vendor/lahaina_QGKI.config

+7 −0
Original line number Diff line number Diff line
@@ -69,3 +69,10 @@ CONFIG_CORESIGHT_TGU=y 
# CONFIG_CORESIGHT_CATU is not set

# CONFIG_CORESIGHT_CTI_SAVE_DISABLE is not set

# CONFIG_CORESIGHT_TPDM_DEFAULT_ENABLE is not set

CONFIG_BTFM_SLIM=m

# CONFIG_QCOM_SPMI_TEMP_ALARM is not set

# CONFIG_SND_SOC_WCD9335 is not set

# CONFIG_SLIM_QCOM_CTRL is not set

# CONFIG_SLIM_QCOM_NGD_CTRL is not set

# CONFIG_SLIMBUS_MSM_CTRL is not set

# CONFIG_SLIMBUS_MSM_NGD is not set

drivers/bluetooth/Kconfig

+6 −28
Original line number Diff line number Diff line
@@ -449,37 +449,15 @@ config MSM_BT_POWER 
		into the kernel or say M to compile as a module.



config BTFM_SLIM

	tristate "MSM Bluetooth/FM Slimbus Driver"

	tristate "MSM Bluetooth/FM Slimbus Device"

	depends on MSM_BT_POWER

	select SLIMBUS

	help

		This enables BT/FM slimbus driver to get multiple audio channel.

		This will make use of slimbus platform driver and slimbus codec

		driver to communicate with slimbus machine driver and LPSS which

		is Slimbus master.



		Slimbus slave initialization and configuration will be done through

		this driver.

		Say Y here to compile support for Bluetooth/FM Slimbus driver

		into the kernel or say M to compile as a module.



config BTFM_SLIM_WCN3990

	tristate "MSM Bluetooth/FM WCN3990 Device"

	select BTFM_SLIM

	help

		This enables specific driver handle for WCN3990 device.

		It is designed to adapt any future BT/FM device to implement a specific

		chip initialization process and control.



		Say Y here to compile support for Bluetooth slimbus driver

		into the kernel or say M to compile as a module.



config BT_SLIM_QCA6390

	tristate "MSM Bluetooth QCA6390 Device"

	select BTFM_SLIM

	help

		This enables specific driver handle for QCA6390 device.

		It is designed to adapt any future BT/FM device to implement a specific

		chip initialization process and control.

		This will make use of slimbus platform driver and slimbus

		codec driver to communicate with slimbus machine driver and LPSS which

		is Slimbus master.Slimbus slave initialization and configuration

		will be done through this driver.



		Say Y here to compile support for Bluetooth slimbus driver

		into the kernel or say M to compile as a module.

drivers/bluetooth/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -33,10 +33,9 @@ obj-$(CONFIG_BT_HCIRSI) += btrsi.o 


obj-$(CONFIG_MSM_BT_POWER)	+= btpower.o



obj-$(CONFIG_BTFM_SLIM)		+= btfm_slim.o

obj-$(CONFIG_BTFM_SLIM)		+= btfm_slim_codec.o

obj-$(CONFIG_BTFM_SLIM_WCN3990)	+= btfm_slim_slave.o

obj-$(CONFIG_BT_SLIM_QCA6390)	+= btfm_slim_slave.o

bt_fm_slim-objs	:= btfm_slim.o btfm_slim_codec.o btfm_slim_slave.o



obj-$(CONFIG_BTFM_SLIM)	+= bt_fm_slim.o



btmrvl-y			:= btmrvl_main.o

btmrvl-$(CONFIG_DEBUG_FS)	+= btmrvl_debugfs.o

drivers/bluetooth/btfm_slim.c

+4 −3
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/debugfs.h>

#include <linux/ratelimit.h>

#include <linux/slab.h>

#include <linux/btpower.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>
@@ -19,7 +20,6 @@ 
#include <sound/tlv.h>

#include "btfm_slim.h"

#include "btfm_slim_slave.h"

#include <linux/bluetooth-power.h>



int btfm_slim_write(struct btfmslim *btfmslim,

		uint16_t reg, int bytes, void *src, uint8_t pgd)
@@ -308,7 +308,7 @@ static int btfm_slim_alloc_port(struct btfmslim *btfmslim) 
	if (!btfmslim)

		return ret;



	chipset_ver = get_chipset_version();

	chipset_ver = btpower_get_chipset_version();

	BTFMSLIM_INFO("chipset soc version:%x", chipset_ver);



	rx_chs = btfmslim->rx_chs;
@@ -543,7 +543,8 @@ static int btfm_slim_probe(struct slim_device *slim) 
		BTFMSLIM_ERR("error, registering slimbus codec failed");

		goto free;

	}

	ret = bt_register_slimdev(&slim->dev);



	ret = btpower_register_slimdev(&slim->dev);

	if (ret < 0) {

		btfm_slim_unregister_codec(&slim->dev);

		goto free;