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

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

Merge "asoc: enable MDF initialization in qcs405 target"

parents 0d5b92fd b2b9d42c

asoc/qcs405.c

+7 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <dsp/audio_notifier.h>

#include <dsp/q6afe-v2.h>

#include <dsp/q6core.h>

#include <dsp/msm_mdf.h>

#include "device_event.h"

#include "msm-pcm-routing-v2.h"

#include "codecs/msm-cdc-pinctrl.h"
@@ -8402,6 +8403,11 @@ static int msm_asoc_machine_probe(struct platform_device *pdev) 
	dev_info(&pdev->dev, "Sound card %s registered\n", card->name);

	spdev = pdev;



	ret = msm_mdf_mem_init();

	if (ret)

		dev_err(&pdev->dev, "msm_mdf_mem_init failed (%d)\n",

			 ret);



	/* Parse pinctrl info from devicetree */

	ret = msm_get_pinctrl(pdev);

	if (!ret) {
@@ -8426,6 +8432,7 @@ static int msm_asoc_machine_remove(struct platform_device *pdev) 
{

	audio_notifier_deregister("qcs405");

	msm_i2s_auxpcm_deinit();

	msm_mdf_mem_deinit();



	msm_release_pinctrl(pdev);

	return 0;

config/qcs405auto.conf

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ CONFIG_DTS_EAGLE=m 
CONFIG_DOLBY_DS2=m

CONFIG_DOLBY_LICENSE=m

CONFIG_DTS_SRS_TM=m

CONFIG_MSM_MDF=m

CONFIG_SND_SOC_MSM_STUB=m

CONFIG_MSM_AVTIMER=m

CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m

config/qcs405autoconf.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#define CONFIG_DOLBY_LICENSE 1

#define CONFIG_DTS_SRS_TM 1

#define CONFIG_SND_SOC_MSM_STUB 1

#define CONFIG_MSM_MDF 1

#define CONFIG_MSM_AVTIMER 1

#define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1

#define CONFIG_SND_SOC_EP92 1

dsp/Kbuild

+4 −0
Original line number Diff line number Diff line
@@ -123,6 +123,10 @@ ifdef CONFIG_MSM_ULTRASOUND 
USF_OBJS += usf.o usfcdev.o q6usm.o

endif



ifdef CONFIG_MSM_MDF

	Q6_OBJS += msm_mdf.o

endif



LINUX_INC +=	-Iinclude/linux



INCS +=		$(COMMON_INC) \

dsp/msm_audio_ion.c

+22 −0
Original line number Diff line number Diff line
@@ -220,6 +220,28 @@ static int msm_audio_ion_get_phys(struct dma_buf *dma_buf, 
	return rc;

}



int msm_audio_ion_get_smmu_info(struct device **cb_dev,

		u64 *smmu_sid)

{

	if (!cb_dev || !smmu_sid) {

		pr_err("%s: Invalid params\n",

			__func__);

		return -EINVAL;

	}



	if (!msm_audio_ion_data.cb_dev ||

		!msm_audio_ion_data.smmu_sid_bits) {

		pr_err("%s: Params not initialized\n",

			__func__);

		return -EINVAL;

	}



	*cb_dev = msm_audio_ion_data.cb_dev;

	*smmu_sid = msm_audio_ion_data.smmu_sid_bits;



	return 0;

}



static void *msm_audio_ion_map_kernel(struct dma_buf *dma_buf)

{

	int rc = 0;