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

Commit 92e3f63a authored by Manjunatha Madana's avatar Manjunatha Madana Committed by ssizon
Browse files

ASoC: msm: Enable msm8952 machine driver for msm8905 

Enable machine_int_dlkm for msm8905 to use msm8952
machine driver.

Change-Id: I07e518b9815d034d2bb035be943e513767638631
parent f8012888

techpack/audio/asoc/codecs/Kbuild

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

	endif

	ifeq ($(CONFIG_ARCH_MSM8909), y)

		ifeq ($(CONFIG_MSM_BGCOM), y)

			include $(AUDIO_ROOT)/config/msm8909auto.conf

			export

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

		endif

		ifeq ($(CONFIG_MSM_8905), m)

			include $(AUDIO_ROOT)/config/msm8905auto.conf

			export

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

		endif

	endif

	ifeq ($(CONFIG_ARCH_MSM8917), y)

		include $(AUDIO_ROOT)/config/sdm450auto.conf

		export

techpack/audio/asoc/codecs/sdm660_cdc/Kbuild

+10 −3
Original line number Diff line number Diff line
@@ -41,10 +41,17 @@ ifeq ($(KERNEL_BUILD), 0) 
		INCS    +=  -include $(AUDIO_ROOT)/config/sdm450autoconf.h

	endif

	ifeq ($(CONFIG_ARCH_MSM8909), y)

		ifeq ($(CONFIG_MSM_BGCOM), y)

			include $(AUDIO_ROOT)/config/msm8909auto.conf

			export

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

		endif

		ifeq ($(CONFIG_MSM_8905), m)

			include $(AUDIO_ROOT)/config/msm8905auto.conf

			export

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

		endif

	endif

endif



# As per target team, build is done as follows:

techpack/audio/asoc/msm8952.c

+9 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2016, 2018, 2020, The Linux Foundation.

 * All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2968,17 +2969,19 @@ static int msm8952_asoc_machine_probe(struct platform_device *pdev) 
	const char *ext_pa = "qcom,msm-ext-pa";

	const char *mclk = "qcom,msm-mclk-freq";

	const char *wsa = "asoc-wsa-codec-names";

	const char *wsa_prefix = "asoc-wsa-codec-prefixes";

	const char *type = NULL;

	const char *ext_pa_str = NULL;

	const char *wsa_str = NULL;

	const char *wsa_prefix_str = NULL;

	const char *spk_ext_pa = "qcom,msm-spk-ext-pa";

	int num_strings;

	int id, i, val;

	int ret = 0;

	struct resource *muxsel;

#if IS_ENABLED(CONFIG_SND_SOC_WSA881X_ANALOG)

	const char *wsa_prefix = "asoc-wsa-codec-prefixes";

	const char *wsa_str = NULL;

	const char *wsa_prefix_str = NULL;

	char *temp_str = NULL;

#endif



	pdata = devm_kzalloc(&pdev->dev,

				sizeof(struct msm_asoc_mach_data),
@@ -3060,6 +3063,7 @@ static int msm8952_asoc_machine_probe(struct platform_device *pdev) 
	/*reading the gpio configurations from dtsi file*/

	num_strings = of_property_count_strings(pdev->dev.of_node,

			wsa);

#if IS_ENABLED(CONFIG_SND_SOC_WSA881X_ANALOG)

	if (num_strings > 0) {

		if (wsa881x_get_probing_count() < 2) {

			ret = -EPROBE_DEFER;
@@ -3125,6 +3129,7 @@ static int msm8952_asoc_machine_probe(struct platform_device *pdev) 
			msm_anlg_cdc_update_int_spk_boost(false);

		}

	}

#endif



	card = msm8952_populate_sndcard_dailinks(&pdev->dev);

	dev_dbg(&pdev->dev, "default codec configured\n");

techpack/audio/config/msm8905auto.conf

0 → 100644
+19 −0
Original line number Diff line number Diff line 
CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m

CONFIG_WCD9XXX_CODEC_CORE=m

CONFIG_SND_SOC_QDSP6V2=m

CONFIG_QTI_PP=m

CONFIG_SND_SOC_MSM8909=m

CONFIG_SND_SOC_ANALOG_CDC=m

CONFIG_SND_SOC_DIGITAL_CDC_LEGACY=m

CONFIG_SND_SOC_WCD9XXX_V2=m

CONFIG_SND_SOC_WCD_MBHC=m

CONFIG_SND_SOC_WCD_MBHC_LEGACY=m

CONFIG_SND_SOC_MSM_STUB=m

CONFIG_MSM_QDSP6_APRV3=m

CONFIG_MSM_ADSP_LOADER=m

CONFIG_MSM_QDSP6_NOTIFIER=m

CONFIG_MSM_CDC_PINCTRL=m

CONFIG_MSM_QDSP6_SSR=m

CONFIG_SND_HWDEP_ROUTING=m

CONFIG_SND_SOC_SDM660_CDC=m

CONFIG_COMMON_CLK_MSM=m

techpack/audio/config/msm8905autoconf.h

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#define CONFIG_SND_SOC_MSM_HOSTLESS_PCM 1

#define CONFIG_WCD9XXX_CODEC_CORE 1

#define CONFIG_SND_SOC_QDSP6V2 1

#define CONFIG_QTI_PP 1

#define CONFIG_SND_SOC_MSM8909 1

#define CONFIG_SND_SOC_ANALOG_CDC 1

#define CONFIG_SND_SOC_DIGITAL_CDC_LEGACY 1

#define CONFIG_SND_SOC_WCD9XXX_V2 1

#define CONFIG_SND_SOC_WCD_MBHC 1

#define CONFIG_SND_SOC_WCD_MBHC_LEGACY 1

#define CONFIG_SND_SOC_MSM_STUB 1

#define CONFIG_MSM_QDSP6_APRV3 1

#define CONFIG_MSM_QDSP6_NOTIFIER 1

#define CONFIG_MSM_QDSP6_SSR 1

#define CONFIG_MSM_ADSP_LOADER 1

#define CONFIG_MSM_CDC_PINCTRL 1

#define CONFIG_SND_HWDEP_ROUTING 1

#define CONFIG_SND_SOC_SDM660_CDC 1

#define CONFIG_COMMON_CLK_MSM 1