ASoC: Intel: add bytct-rt5651 machine driver (2bd5bd15) · Commits · e / devices / android_kernel_fairphone_FP4

sound/soc/intel/Kconfig

+12 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,18 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH
		Say Y if you have such a device
		If unsure select "N".

		config SND_SOC_INTEL_BYTCR_RT5651_MACH
		tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
		depends on X86 && I2C
		select SND_SOC_RT5651
		select SND_SST_MFLD_PLATFORM
		select SND_SST_IPC_ACPI
		help
		This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
		platforms with RT5651 audio codec.
		Say Y if you have such a device
		If unsure select "N".

		config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
		tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
		depends on X86_INTEL_LPSS && I2C

sound/soc/intel/atom/sst/sst_acpi.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -316,6 +316,9 @@ static int sst_acpi_remove(struct platform_device *pdev)
		static struct sst_acpi_mach sst_acpi_bytcr[] = {
		{"10EC5640", "bytcr_rt5640", "intel/fw_sst_0f28.bin", "bytcr_rt5640", NULL,
		&byt_rvp_platform_data },
		{"10EC5651", "bytcr_rt5651", "intel/fw_sst_0f28.bin", "bytcr_rt5651", NULL,
		&byt_rvp_platform_data },

		{},
		};

sound/soc/intel/boards/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@ snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o
		snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o
		snd-soc-sst-broadwell-objs := broadwell.o
		snd-soc-sst-bytcr-rt5640-objs := bytcr_rt5640.o
		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-rt5645-objs := cht_bsw_rt5645.o
		snd-soc-sst-cht-bsw-max98090_ti-objs := cht_bsw_max98090_ti.o
		@@ -15,6 +16,7 @@ obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o
		obj-$(CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH) += snd-soc-sst-byt-max98090-mach.o
		obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-sst-broadwell.o
		obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-rt5640.o
		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_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

sound/soc/intel/boards/bytcr_rt5651.c

0 → 100644

+332 −0

Original line number	Diff line number	Diff line
		/*
		* bytcr_rt5651.c - ASoc Machine driver for Intel Byt CR platform
		* (derived from bytcr_rt5640.c)
		*
		* Copyright (C) 2015 Intel Corp
		* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
		*
		* 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/init.h>
		#include <linux/module.h>
		#include <linux/platform_device.h>
		#include <linux/acpi.h>
		#include <linux/device.h>
		#include <linux/dmi.h>
		#include <linux/slab.h>
		#include <sound/pcm.h>
		#include <sound/pcm_params.h>
		#include <sound/soc.h>
		#include <sound/jack.h>
		#include "../../codecs/rt5651.h"
		#include "../atom/sst-atom-controls.h"

		static const struct snd_soc_dapm_widget byt_rt5651_widgets[] = {
		SND_SOC_DAPM_HP("Headphone", NULL),
		SND_SOC_DAPM_MIC("Headset Mic", NULL),
		SND_SOC_DAPM_MIC("Internal Mic", NULL),
		SND_SOC_DAPM_SPK("Speaker", NULL),
		};

		static const struct snd_soc_dapm_route byt_rt5651_audio_map[] = {
		{"AIF1 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, "AIF1 Capture"},

		{"Headset Mic", NULL, "micbias1"}, /* lowercase for rt5651 */
		{"IN2P", NULL, "Headset Mic"},
		{"Headphone", NULL, "HPOL"},
		{"Headphone", NULL, "HPOR"},
		{"Speaker", NULL, "LOUTL"},
		{"Speaker", NULL, "LOUTR"},
		};

		static const struct snd_soc_dapm_route byt_rt5651_intmic_dmic1_map[] = {
		{"DMIC1", NULL, "Internal Mic"},
		};

		static const struct snd_soc_dapm_route byt_rt5651_intmic_dmic2_map[] = {
		{"DMIC2", NULL, "Internal Mic"},
		};

		static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_map[] = {
		{"Internal Mic", NULL, "micbias1"},
		{"IN1P", NULL, "Internal Mic"},
		};

		enum {
		BYT_RT5651_DMIC1_MAP,
		BYT_RT5651_DMIC2_MAP,
		BYT_RT5651_IN1_MAP,
		};

		#define BYT_RT5651_MAP(quirk) ((quirk) & 0xff)
		#define BYT_RT5651_DMIC_EN BIT(16)

		static unsigned long byt_rt5651_quirk = BYT_RT5651_DMIC1_MAP \|
		BYT_RT5651_DMIC_EN;

		static const struct snd_kcontrol_new byt_rt5651_controls[] = {
		SOC_DAPM_PIN_SWITCH("Headphone"),
		SOC_DAPM_PIN_SWITCH("Headset Mic"),
		SOC_DAPM_PIN_SWITCH("Internal Mic"),
		SOC_DAPM_PIN_SWITCH("Speaker"),
		};

		static int byt_rt5651_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;

		snd_soc_dai_set_bclk_ratio(codec_dai, 50);

		ret = snd_soc_dai_set_sysclk(codec_dai, RT5651_SCLK_S_PLL1,
		params_rate(params) * 512,
		SND_SOC_CLOCK_IN);
		if (ret < 0) {
		dev_err(rtd->dev, "can't set codec clock %d\n", ret);
		return ret;
		}

		ret = snd_soc_dai_set_pll(codec_dai, 0, RT5651_PLL1_S_BCLK1,
		params_rate(params) * 50,
		params_rate(params) * 512);
		if (ret < 0) {
		dev_err(rtd->dev, "can't set codec pll: %d\n", ret);
		return ret;
		}

		return 0;
		}

		static const struct dmi_system_id byt_rt5651_quirk_table[] = {
		{}
		};

		static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)
		{
		int ret;
		struct snd_soc_card *card = runtime->card;
		const struct snd_soc_dapm_route *custom_map;
		int num_routes;

		card->dapm.idle_bias_off = true;

		dmi_check_system(byt_rt5651_quirk_table);
		switch (BYT_RT5651_MAP(byt_rt5651_quirk)) {
		case BYT_RT5651_IN1_MAP:
		custom_map = byt_rt5651_intmic_in1_map;
		num_routes = ARRAY_SIZE(byt_rt5651_intmic_in1_map);
		break;
		case BYT_RT5651_DMIC2_MAP:
		custom_map = byt_rt5651_intmic_dmic2_map;
		num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic2_map);
		break;
		default:
		custom_map = byt_rt5651_intmic_dmic1_map;
		num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic1_map);
		}

		ret = snd_soc_add_card_controls(card, byt_rt5651_controls,
		ARRAY_SIZE(byt_rt5651_controls));
		if (ret) {
		dev_err(card->dev, "unable to add card controls\n");
		return ret;
		}
		snd_soc_dapm_ignore_suspend(&card->dapm, "Headphone");
		snd_soc_dapm_ignore_suspend(&card->dapm, "Speaker");

		return ret;
		}

		static const struct snd_soc_pcm_stream byt_rt5651_dai_params = {
		.formats = SNDRV_PCM_FMTBIT_S24_LE,
		.rate_min = 48000,
		.rate_max = 48000,
		.channels_min = 2,
		.channels_max = 2,
		};

		static int byt_rt5651_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);
		int ret;

		/* 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 */
		params_set_format(params, SNDRV_PCM_FORMAT_S24_LE);

		/*
		* Default mode for SSP configuration is TDM 4 slot, override config
		* with explicit setting to I2S 2ch 24-bit. The word length is set with
		* dai_set_tdm_slot() since there is no other API exposed
		*/
		ret = snd_soc_dai_set_fmt(rtd->cpu_dai,
		SND_SOC_DAIFMT_I2S \|
		SND_SOC_DAIFMT_NB_IF \|
		SND_SOC_DAIFMT_CBS_CFS
		);

		if (ret < 0) {
		dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret);
		return ret;
		}

		ret = snd_soc_dai_set_tdm_slot(rtd->cpu_dai, 0x3, 0x3, 2, 24);
		if (ret < 0) {
		dev_err(rtd->dev, "can't set I2S config, err %d\n", ret);
		return ret;
		}

		return 0;
		}

		static unsigned int rates_48000[] = {
		48000,
		};

		static struct snd_pcm_hw_constraint_list constraints_48000 = {
		.count = ARRAY_SIZE(rates_48000),
		.list = rates_48000,
		};

		static int byt_rt5651_aif1_startup(struct snd_pcm_substream *substream)
		{
		return snd_pcm_hw_constraint_list(substream->runtime, 0,
		SNDRV_PCM_HW_PARAM_RATE,
		&constraints_48000);
		}

		static struct snd_soc_ops byt_rt5651_aif1_ops = {
		.startup = byt_rt5651_aif1_startup,
		};

		static struct snd_soc_ops byt_rt5651_be_ssp2_ops = {
		.hw_params = byt_rt5651_aif1_hw_params,
		};

		static struct snd_soc_dai_link byt_rt5651_dais[] = {
		[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",
		.ignore_suspend = 1,
		.nonatomic = true,
		.dynamic = 1,
		.dpcm_playback = 1,
		.dpcm_capture = 1,
		.ops = &byt_rt5651_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",
		.ignore_suspend = 1,
		.nonatomic = true,
		.dynamic = 1,
		.dpcm_playback = 1,
		.ops = &byt_rt5651_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",
		},
		/* CODEC<->CODEC link */
		/* back ends */
		{
		.name = "SSP2-Codec",
		.be_id = 1,
		.cpu_dai_name = "ssp2-port",
		.platform_name = "sst-mfld-platform",
		.no_pcm = 1,
		.codec_dai_name = "rt5651-aif1",
		.codec_name = "i2c-10EC5651:00",
		.dai_fmt = SND_SOC_DAIFMT_I2S \| SND_SOC_DAIFMT_NB_NF
		\| SND_SOC_DAIFMT_CBS_CFS,
		.be_hw_params_fixup = byt_rt5651_codec_fixup,
		.ignore_suspend = 1,
		.nonatomic = true,
		.dpcm_playback = 1,
		.dpcm_capture = 1,
		.init = byt_rt5651_init,
		.ops = &byt_rt5651_be_ssp2_ops,
		},
		};

		/* SoC card */
		static struct snd_soc_card byt_rt5651_card = {
		.name = "bytcr-rt5651",
		.owner = THIS_MODULE,
		.dai_link = byt_rt5651_dais,
		.num_links = ARRAY_SIZE(byt_rt5651_dais),
		.dapm_widgets = byt_rt5651_widgets,
		.num_dapm_widgets = ARRAY_SIZE(byt_rt5651_widgets),
		.dapm_routes = byt_rt5651_audio_map,
		.num_dapm_routes = ARRAY_SIZE(byt_rt5651_audio_map),
		.fully_routed = true,
		};

		static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
		{
		int ret_val = 0;

		/* register the soc card */
		byt_rt5651_card.dev = &pdev->dev;

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

		if (ret_val) {
		dev_err(&pdev->dev, "devm_snd_soc_register_card failed %d\n",
		ret_val);
		return ret_val;
		}
		platform_set_drvdata(pdev, &byt_rt5651_card);
		return ret_val;
		}

		static struct platform_driver snd_byt_rt5651_mc_driver = {
		.driver = {
		.name = "bytcr_rt5651",
		.pm = &snd_soc_pm_ops,
		},
		.probe = snd_byt_rt5651_mc_probe,
		};

		module_platform_driver(snd_byt_rt5651_mc_driver);

		MODULE_DESCRIPTION("ASoC Intel(R) Baytrail CR Machine driver for RT5651");
		MODULE_AUTHOR("Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>");
		MODULE_LICENSE("GPL v2");
		MODULE_ALIAS("platform:bytcr_rt5651");