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

Commit cb9c130a authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: ak4642: add SND_SOC_DAIFMT_FORMAT support 



This patch support LEFT_J / I2S only for now

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 477adb06

sound/soc/codecs/ak4642.c

+24 −0
Original line number Diff line number Diff line
@@ -116,6 +116,12 @@ 
#define BCKO_MASK	(1 << 3)

#define BCKO_64		BCKO_MASK



#define DIF_MASK	(3 << 0)

#define DSP		(0 << 0)

#define RIGHT_J		(1 << 0)

#define LEFT_J		(2 << 0)

#define I2S		(3 << 0)



/* MD_CTL2 */

#define FS0		(1 << 0)

#define FS1		(1 << 1)
@@ -354,6 +360,24 @@ static int ak4642_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
	snd_soc_update_bits(codec, PW_MGMT2, MS, data);

	snd_soc_update_bits(codec, MD_CTL1, BCKO_MASK, bcko);



	/* format type */

	data = 0;

	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {

	case SND_SOC_DAIFMT_LEFT_J:

		data = LEFT_J;

		break;

	case SND_SOC_DAIFMT_I2S:

		data = I2S;

		break;

	/* FIXME

	 * Please add RIGHT_J / DSP support here

	 */

	default:

		return -EINVAL;

		break;

	}

	snd_soc_update_bits(codec, MD_CTL1, DIF_MASK, data);



	return 0;

}

sound/soc/sh/fsi-ak4642.c

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ static int fsi_ak4642_dai_init(struct snd_soc_pcm_runtime *rtd) 
	struct snd_soc_dai *dai = rtd->codec_dai;

	int ret;



	ret = snd_soc_dai_set_fmt(dai, SND_SOC_DAIFMT_CBM_CFM);

	ret = snd_soc_dai_set_fmt(dai, SND_SOC_DAIFMT_LEFT_J |

				       SND_SOC_DAIFMT_CBM_CFM);

	if (ret < 0)

		return ret;