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

Commit 9264698e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: audio-ext-clk: Add support for multiple lpass clock sources"

parents 057e0e85 7259ca6c

Android.mk

+7 −2
Original line number Diff line number Diff line
@@ -24,11 +24,16 @@ include $(MY_LOCAL_PATH)/asoc/codecs/Android.mk 
include $(MY_LOCAL_PATH)/asoc/codecs/wcd934x/Android.mk

endif



ifeq ($(call is-board-platform-in-list,sdm670 msmnile $(MSMSTEPPE)),true)

ifeq ($(call is-board-platform-in-list,sdm670 msmnile),true)

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/aqt1000/Module.symvers)

include $(MY_LOCAL_PATH)/asoc/codecs/aqt1000/Android.mk

endif



ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE)),true)

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/bolero/Module.symvers)

include $(MY_LOCAL_PATH)/asoc/codecs/bolero/Android.mk

endif



ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true)

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/sdm660_cdc/Module.symvers)

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/msm_sdw/Module.symvers)
@@ -36,7 +41,7 @@ include $(MY_LOCAL_PATH)/asoc/codecs/sdm660_cdc/Android.mk 
include $(MY_LOCAL_PATH)/asoc/codecs/msm_sdw/Android.mk

endif



ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE)),true)

ifeq ($(call is-board-platform-in-list,msmnile),true)

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd9360/Module.symvers)

include $(MY_LOCAL_PATH)/asoc/codecs/wcd9360/Android.mk

endif

asoc/Kbuild

+10 −2
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ ifeq ($(KERNEL_BUILD), 0) 
		INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h

	endif

	ifeq ($(CONFIG_ARCH_SM6150), y)

		include $(AUDIO_ROOT)/config/sm8150auto.conf

		include $(AUDIO_ROOT)/config/sm6150auto.conf

		export

		INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h

		INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h

	endif

	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)

		include $(AUDIO_ROOT)/config/sm8150auto.conf
@@ -104,6 +104,11 @@ ifdef CONFIG_SND_SOC_SM8150 
	MACHINE_OBJS += sm8150.o

endif



# for SM6150 sound card driver

ifdef CONFIG_SND_SOC_SM6150

	MACHINE_OBJS += sm6150.o

endif



# for qcs405 sound card driver

ifdef CONFIG_SND_SOC_QCS405

	MACHINE_OBJS += qcs405.o
@@ -200,6 +205,9 @@ machine_dlkm-y := $(MACHINE_OBJS) 
obj-$(CONFIG_SND_SOC_SM8150) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)



obj-$(CONFIG_SND_SOC_SM6150) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)



obj-$(CONFIG_SND_SOC_QCS405) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)

asoc/codecs/Kbuild

+2 −2
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ ifeq ($(KERNEL_BUILD), 0) 
		INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h

	endif

	ifeq ($(CONFIG_ARCH_SM6150), y)

		include $(AUDIO_ROOT)/config/sm8150auto.conf

		include $(AUDIO_ROOT)/config/sm6150auto.conf

		export

		INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h

		INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h

	endif

	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)

		include $(AUDIO_ROOT)/config/sm8150auto.conf

asoc/codecs/aqt1000/Kbuild

+0 −5
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ ifeq ($(KERNEL_BUILD), 0) 
		export

		INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h

	endif

	ifeq ($(CONFIG_ARCH_SM6150), y)

		include $(AUDIO_ROOT)/config/sm8150auto.conf

		export

		INCS    +=  -include $(AUDIO_ROOT)/config/sm8150autoconf.h

	endif



	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)

		include $(AUDIO_ROOT)/config/sm8150auto.conf

asoc/codecs/audio-ext-clk-up.c

+48 −0
Original line number Diff line number Diff line
@@ -29,6 +29,10 @@ enum { 
	AUDIO_EXT_CLK_LPASS,

	AUDIO_EXT_CLK_LPASS2,

	AUDIO_EXT_CLK_LPASS3,

	AUDIO_EXT_CLK_LPASS4,

	AUDIO_EXT_CLK_LPASS5,

	AUDIO_EXT_CLK_LPASS6,

	AUDIO_EXT_CLK_LPASS7,

	AUDIO_EXT_CLK_LPASS_MAX,

	AUDIO_EXT_CLK_MAX = AUDIO_EXT_CLK_LPASS_MAX,

};
@@ -226,6 +230,50 @@ static struct audio_ext_clk audio_clk_array[] = { 
			},

		},

	},

	{

		.pnctrl_info = {NULL},

		.fact = {

			.mult = 1,

			.div = 1,

			.hw.init = &(struct clk_init_data){

				.name = "audio_lpass_mclk4",

				.ops = &audio_ext_clk_ops,

			},

		},

	},

	{

		.pnctrl_info = {NULL},

		.fact = {

			.mult = 1,

			.div = 1,

			.hw.init = &(struct clk_init_data){

				.name = "audio_lpass_mclk5",

				.ops = &audio_ext_clk_ops,

			},

		},

	},

	{

		.pnctrl_info = {NULL},

		.fact = {

			.mult = 1,

			.div = 1,

			.hw.init = &(struct clk_init_data){

				.name = "audio_lpass_mclk6",

				.ops = &audio_ext_clk_ops,

			},

		},

	},

	{

		.pnctrl_info = {NULL},

		.fact = {

			.mult = 1,

			.div = 1,

			.hw.init = &(struct clk_init_data){

				.name = "audio_lpass_mclk7",

				.ops = &audio_ext_clk_ops,

			},

		},

	},

};



static int audio_get_pinctrl(struct platform_device *pdev)