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

Unverified Commit 5b00ce63 authored by John Hsu's avatar John Hsu Committed by Mark Brown
Browse files

ASoC: Intel: add nau8824 sound card 



Create sound card with NAU88L24 codec in Intel Cherryview-based platforms,
Cherrytrail and Braswell.

Signed-off-by: default avatarJohn Hsu <KCHSU0@nuvoton.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 256ac58a

sound/soc/intel/boards/Kconfig

+11 −0
Original line number Original line Diff line number Diff line
@@ -125,6 +125,17 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH 
	  Say Y or m if you have such a device. This is a recommended option.

	  Say Y or m if you have such a device. This is a recommended option.

	  If unsure select "N".

	  If unsure select "N".





config SND_SOC_INTEL_CHT_BSW_NAU8824_MACH

	tristate "Cherrytrail & Braswell with NAU88L24 codec"

	depends on X86_INTEL_LPSS && I2C && ACPI

	select SND_SOC_ACPI

	select SND_SOC_NAU8824

	help

	  This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell

	  platforms with NAU88L24 audio codec.

	  Say Y or m if you have such a device. This is a recommended option.

	  If unsure select "N".



config SND_SOC_INTEL_BYT_CHT_DA7213_MACH

config SND_SOC_INTEL_BYT_CHT_DA7213_MACH

	tristate "Baytrail & Cherrytrail with DA7212/7213 codec"

	tristate "Baytrail & Cherrytrail with DA7212/7213 codec"

	depends on X86_INTEL_LPSS && I2C && ACPI

	depends on X86_INTEL_LPSS && I2C && ACPI

sound/soc/intel/boards/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ snd-soc-sst-bytcr-rt5651-objs := bytcr_rt5651.o 
snd-soc-sst-cht-bsw-rt5672-objs := cht_bsw_rt5672.o

snd-soc-sst-cht-bsw-rt5672-objs := cht_bsw_rt5672.o

snd-soc-sst-cht-bsw-rt5645-objs := cht_bsw_rt5645.o

snd-soc-sst-cht-bsw-rt5645-objs := cht_bsw_rt5645.o

snd-soc-sst-cht-bsw-max98090_ti-objs := cht_bsw_max98090_ti.o

snd-soc-sst-cht-bsw-max98090_ti-objs := cht_bsw_max98090_ti.o

snd-soc-sst-cht-bsw-nau8824-objs := cht_bsw_nau8824.o

snd-soc-sst-byt-cht-da7213-objs := bytcht_da7213.o

snd-soc-sst-byt-cht-da7213-objs := bytcht_da7213.o

snd-soc-sst-byt-cht-es8316-objs := bytcht_es8316.o

snd-soc-sst-byt-cht-es8316-objs := bytcht_es8316.o

snd-soc-sst-byt-cht-nocodec-objs := bytcht_nocodec.o

snd-soc-sst-byt-cht-nocodec-objs := bytcht_nocodec.o
@@ -33,6 +34,7 @@ obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH) += snd-soc-sst-bytcr-rt5651.o 
obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH) += snd-soc-sst-cht-bsw-rt5672.o

obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH) += snd-soc-sst-cht-bsw-rt5672.o

obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH) += snd-soc-sst-cht-bsw-rt5645.o

obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH) += snd-soc-sst-cht-bsw-rt5645.o

obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH) += snd-soc-sst-cht-bsw-max98090_ti.o

obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH) += snd-soc-sst-cht-bsw-max98090_ti.o

obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH) += snd-soc-sst-cht-bsw-nau8824.o

obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH) += snd-soc-sst-byt-cht-da7213.o

obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH) += snd-soc-sst-byt-cht-da7213.o

obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH) += snd-soc-sst-byt-cht-es8316.o

obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH) += snd-soc-sst-byt-cht-es8316.o

obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH) += snd-soc-sst-byt-cht-nocodec.o

obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH) += snd-soc-sst-byt-cht-nocodec.o

sound/soc/intel/boards/cht_bsw_nau8824.c

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

 *  cht-bsw-nau8824.c - ASoc Machine driver for Intel Cherryview-based

 *          platforms Cherrytrail and Braswell, with nau8824 codec.

 *

 *  Copyright (C) 2018 Intel Corp

 *  Copyright (C) 2018 Nuvoton Technology Corp

 *

 *  Author: Wang, Joseph C <joequant@gmail.com>

 *  Co-author: John Hsu <KCHSU0@nuvoton.com>

 *  This file is based on cht_bsw_rt5672.c and cht-bsw-max98090.c

 *

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

 *  it under the terms of the GNU General Public License as published by

 *  the Free Software Foundation; version 2 of the License.

 *

 *  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.

 */



#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>

#include <sound/jack.h>

#include <linux/input.h>

#include "../atom/sst-atom-controls.h"

#include "../../codecs/nau8824.h"



struct cht_mc_private {

	struct snd_soc_jack jack;

};



static struct snd_soc_jack_pin cht_bsw_jack_pins[] = {

	{

		.pin = "Headphone",

		.mask = SND_JACK_HEADPHONE,

	},

	{

		.pin = "Headset Mic",

		.mask = SND_JACK_MICROPHONE,

	},

};



static const struct snd_soc_dapm_widget cht_dapm_widgets[] = {

	SND_SOC_DAPM_HP("Headphone", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

	SND_SOC_DAPM_MIC("Int Mic", NULL),

	SND_SOC_DAPM_SPK("Ext Spk", NULL),

};



static const struct snd_soc_dapm_route cht_audio_map[] = {

	{"Ext Spk", NULL, "SPKOUTL"},

	{"Ext Spk", NULL, "SPKOUTR"},

	{"Headphone", NULL, "HPOL"},

	{"Headphone", NULL, "HPOR"},

	{"MIC1", NULL, "Int Mic"},

	{"MIC2", NULL, "Int Mic"},

	{"HSMIC1", NULL, "Headset Mic"},

	{"HSMIC2", NULL, "Headset Mic"},

	{"Playback", NULL, "ssp2 Tx"},

	{"ssp2 Tx", NULL, "codec_out0"},

	{"ssp2 Tx", NULL, "codec_out1"},

	{"codec_in0", NULL, "ssp2 Rx" },

	{"codec_in1", NULL, "ssp2 Rx" },

	{"ssp2 Rx", NULL, "Capture"},

};



static const struct snd_kcontrol_new cht_mc_controls[] = {

	SOC_DAPM_PIN_SWITCH("Headphone"),

	SOC_DAPM_PIN_SWITCH("Headset Mic"),

	SOC_DAPM_PIN_SWITCH("Int Mic"),

	SOC_DAPM_PIN_SWITCH("Ext Spk"),

};



static int cht_aif1_hw_params(struct snd_pcm_substream *substream,

	struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	int ret;



	ret = snd_soc_dai_set_sysclk(codec_dai, NAU8824_CLK_FLL_FS, 0,

		SND_SOC_CLOCK_IN);

	if (ret < 0) {

		dev_err(codec_dai->dev, "can't set FS clock %d\n", ret);

		return ret;

	}

	ret = snd_soc_dai_set_pll(codec_dai, 0, 0, params_rate(params),

		params_rate(params) * 256);

	if (ret < 0) {

		dev_err(codec_dai->dev, "can't set FLL: %d\n", ret);

		return ret;

	}



	return 0;

}



static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)

{

	struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card);

	struct snd_soc_jack *jack = &ctx->jack;

	struct snd_soc_codec *codec = runtime->codec;

	struct snd_soc_dai *codec_dai = runtime->codec_dai;

	int ret, jack_type;



	/* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */

	ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xf, 0x1, 4, 24);

	if (ret < 0) {

		dev_err(runtime->dev, "can't set codec TDM slot %d\n", ret);

		return ret;

	}



	/* NAU88L24 supports 4 butons headset detection

	 * KEY_MEDIA

	 * KEY_VOICECOMMAND

	 * KEY_VOLUMEUP

	 * KEY_VOLUMEDOWN

	 */

	jack_type = SND_JACK_HEADPHONE | SND_JACK_BTN_0 | SND_JACK_BTN_1 |

		SND_JACK_BTN_2 | SND_JACK_BTN_3;

	ret = snd_soc_card_jack_new(runtime->card, "Headset", jack_type, jack,

		cht_bsw_jack_pins, ARRAY_SIZE(cht_bsw_jack_pins));

	if (ret) {

		dev_err(runtime->dev,

			"Headset Jack creation failed %d\n", ret);

		return ret;

	}

	snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_MEDIA);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);



	nau8824_enable_jack_detect(codec, jack);



	return ret;

}



static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd,

	struct snd_pcm_hw_params *params)

{

	struct snd_interval *rate = hw_param_interval(params,

		SNDRV_PCM_HW_PARAM_RATE);

	struct snd_interval *channels = hw_param_interval(params,

		SNDRV_PCM_HW_PARAM_CHANNELS);

	struct snd_mask *fmt =

		hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);



	/* The DSP will covert the FE rate to 48k, stereo, 24bits */

	rate->min = rate->max = 48000;

	channels->min = channels->max = 2;



	/* set SSP2 to 24-bit */

	snd_mask_none(fmt);

	params_set_format(params, SNDRV_PCM_FORMAT_S24_LE);



	return 0;

}



static int cht_aif1_startup(struct snd_pcm_substream *substream)

{

	return snd_pcm_hw_constraint_single(substream->runtime,

		SNDRV_PCM_HW_PARAM_RATE, 48000);

}



static const struct snd_soc_ops cht_aif1_ops = {

	.startup = cht_aif1_startup,

};



static const struct snd_soc_ops cht_be_ssp2_ops = {

	.hw_params = cht_aif1_hw_params,

};



static struct snd_soc_dai_link cht_dailink[] = {

	/* Front End DAI links */

	[MERR_DPCM_AUDIO] = {

		.name = "Audio Port",

		.stream_name = "Audio",

		.cpu_dai_name = "media-cpu-dai",

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

		.nonatomic = true,

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.ops = &cht_aif1_ops,

	},

	[MERR_DPCM_DEEP_BUFFER] = {

		.name = "Deep-Buffer Audio Port",

		.stream_name = "Deep-Buffer Audio",

		.cpu_dai_name = "deepbuffer-cpu-dai",

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

		.nonatomic = true,

		.dynamic = 1,

		.dpcm_playback = 1,

		.ops = &cht_aif1_ops,

	},

	[MERR_DPCM_COMPR] = {

		.name = "Compressed Port",

		.stream_name = "Compress",

		.cpu_dai_name = "compress-cpu-dai",

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

	},

	/* Back End DAI links */

	{

		/* SSP2 - Codec */

		.name = "SSP2-Codec",

		.id = 1,

		.cpu_dai_name = "ssp2-port",

		.platform_name = "sst-mfld-platform",

		.no_pcm = 1,

		.codec_dai_name = NAU8824_CODEC_DAI,

		.codec_name = "i2c-10508824:00",

		.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF

			| SND_SOC_DAIFMT_CBS_CFS,

		.init = cht_codec_init,

		.be_hw_params_fixup = cht_codec_fixup,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.ops = &cht_be_ssp2_ops,

	},

};



/* SoC card */

static struct snd_soc_card snd_soc_card_cht = {

	.name = "chtnau8824",

	.owner = THIS_MODULE,

	.dai_link = cht_dailink,

	.num_links = ARRAY_SIZE(cht_dailink),

	.dapm_widgets = cht_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(cht_dapm_widgets),

	.dapm_routes = cht_audio_map,

	.num_dapm_routes = ARRAY_SIZE(cht_audio_map),

	.controls = cht_mc_controls,

	.num_controls = ARRAY_SIZE(cht_mc_controls),

};



static int snd_cht_mc_probe(struct platform_device *pdev)

{

	struct cht_mc_private *drv;

	int ret_val;



	drv = devm_kzalloc(&pdev->dev, sizeof(*drv), GFP_ATOMIC);

	if (!drv)

		return -ENOMEM;

	snd_soc_card_set_drvdata(&snd_soc_card_cht, drv);



	/* register the soc card */

	snd_soc_card_cht.dev = &pdev->dev;

	ret_val = devm_snd_soc_register_card(&pdev->dev, &snd_soc_card_cht);

	if (ret_val) {

		dev_err(&pdev->dev,

			"snd_soc_register_card failed %d\n", ret_val);

		return ret_val;

	}

	platform_set_drvdata(pdev, &snd_soc_card_cht);



	return ret_val;

}



static struct platform_driver snd_cht_mc_driver = {

	.driver = {

		.name = "cht-bsw-nau8824",

	},

	.probe = snd_cht_mc_probe,

};



module_platform_driver(snd_cht_mc_driver);



MODULE_DESCRIPTION("ASoC Intel(R) Baytrail CR Machine driver");

MODULE_AUTHOR("Wang, Joseph C <joequant@gmail.com>");

MODULE_AUTHOR("John Hsu <KCHSU0@nuvoton.com>");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:cht-bsw-nau8824");

sound/soc/intel/common/soc-acpi-intel-cht-match.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -117,6 +117,15 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.sof_tplg_filename = "intel/reef-cht-max98090.tplg",

		.sof_tplg_filename = "intel/reef-cht-max98090.tplg",

		.asoc_plat_name = "sst-mfld-platform",

		.asoc_plat_name = "sst-mfld-platform",

	},

	},

	{

		.id = "10508824",

		.drv_name = "cht-bsw-nau8824",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "cht-bsw",

		.sof_fw_filename = "intel/reef-cht.ri",

		.sof_tplg_filename = "intel/reef-cht-nau8824.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

	{

		.id = "DLGS7212",

		.id = "DLGS7212",

		.drv_name = "bytcht_da7213",

		.drv_name = "bytcht_da7213",