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

Commit 6be1f475 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'fix/fsl-esai' of... 

Merge branch 'fix/fsl-esai' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-fsl-esai
parents de0d712a 769091ee

sound/soc/fsl/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,6 @@ config SND_SOC_FSL_ESAI 
	tristate "Enhanced Serial Audio Interface (ESAI) module support"

	tristate "Enhanced Serial Audio Interface (ESAI) module support"

	select REGMAP_MMIO

	select REGMAP_MMIO

	select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n

	select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n

	select SND_SOC_FSL_UTILS

	help

	help

	  Say Y if you want to add Enhanced Synchronous Audio Interface

	  Say Y if you want to add Enhanced Synchronous Audio Interface

	  (ESAI) support for the Freescale CPUs.

	  (ESAI) support for the Freescale CPUs.

sound/soc/fsl/fsl_esai.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ 




#include "fsl_esai.h"

#include "fsl_esai.h"

#include "imx-pcm.h"

#include "imx-pcm.h"

#include "fsl_utils.h"





#define FSL_ESAI_RATES		SNDRV_PCM_RATE_8000_192000

#define FSL_ESAI_RATES		SNDRV_PCM_RATE_8000_192000

#define FSL_ESAI_FORMATS	(SNDRV_PCM_FMTBIT_S8 | \

#define FSL_ESAI_FORMATS	(SNDRV_PCM_FMTBIT_S8 | \
@@ -612,7 +611,6 @@ static struct snd_soc_dai_ops fsl_esai_dai_ops = { 
	.hw_params = fsl_esai_hw_params,

	.hw_params = fsl_esai_hw_params,

	.set_sysclk = fsl_esai_set_dai_sysclk,

	.set_sysclk = fsl_esai_set_dai_sysclk,

	.set_fmt = fsl_esai_set_dai_fmt,

	.set_fmt = fsl_esai_set_dai_fmt,

	.xlate_tdm_slot_mask = fsl_asoc_xlate_tdm_slot_mask,

	.set_tdm_slot = fsl_esai_set_dai_tdm_slot,

	.set_tdm_slot = fsl_esai_set_dai_tdm_slot,

};

};