[PATCH] ASoC: Intel: Skylake - Add Skylake RT286 I2S machine driver

[PATCH] ASoC: Intel: Skylake - Add Skylake RT286 I2S machine driver

[Vinod Koul]

From: Omair M Abdullah <omair.m.abdullah@intel.com>

Add the SKL I2S machine driver using Realtek ALC286S codec
in I2S mode.

Signed-off-by: Omair M Abdullah <omair.m.abdullah@intel.com>
Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 sound/soc/intel/Kconfig            |  12 ++
 sound/soc/intel/boards/Makefile    |   2 +
 sound/soc/intel/boards/skl_rt286.c | 268 +++++++++++++++++++++++++++++++++++++
 3 files changed, 282 insertions(+)
 create mode 100644 sound/soc/intel/boards/skl_rt286.c

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 664df1f44530..ea3221a8b615 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -140,3 +140,15 @@ config SND_SOC_INTEL_SKYLAKE
 	select SND_HDA_EXT_CORE
 	select SND_SOC_TOPOLOGY
 	select SND_SOC_INTEL_SST
+
+config SND_SOC_INTEL_SKL_RT286_MACH
+	tristate "ASoC Audio driver for SKL with RT286 I2S mode"
+	select SND_SOC_INTEL_SST
+	select SND_SOC_INTEL_SKYLAKE
+	select SND_SOC_RT286
+	select SND_SOC_DMIC
+	help
+	   This adds support for ASoC machine driver for Skylake platforms
+	   with RT286 I2S audio codec.
+	   Say Y if you have such a device
+	   If unsure select "N".
diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile
index cb94895c9edb..371c4565cad8 100644
--- a/sound/soc/intel/boards/Makefile
+++ b/sound/soc/intel/boards/Makefile
@@ -6,6 +6,7 @@ snd-soc-sst-bytcr-rt5640-objs := bytcr_rt5640.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
+snd-soc-skl_rt286-objs := skl_rt286.o
 
 obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o
@@ -15,3 +16,4 @@ obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-rt5640.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
+obj-$(CONFIG_SND_SOC_INTEL_SKL_RT286_MACH) += snd-soc-skl_rt286.o
diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c
new file mode 100644
index 000000000000..71907b2c1611
--- /dev/null
+++ b/sound/soc/intel/boards/skl_rt286.c
@@ -0,0 +1,268 @@
+/*
+ * Intel Skylake I2S Machine Driver
+ *
+ * Copyright (C) 2014-2015, Intel Corporation. All rights reserved.
+ *
+ * Modified from:
+ *   Intel Broadwell Wildcatpoint SST Audio
+ *
+ *   Copyright (C) 2013, Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version
+ * 2 as published by the Free Software Foundation.
+ *
+ * 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 <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+#include <sound/jack.h>
+#include <sound/pcm_params.h>
+#include "../../codecs/rt286.h"
+
+static struct snd_soc_jack skylake_headset;
+/* Headset jack detection DAPM pins */
+static struct snd_soc_jack_pin skylake_headset_pins[] = {
+	{
+		.pin = "Mic Jack",
+		.mask = SND_JACK_MICROPHONE,
+	},
+	{
+		.pin = "Headphone Jack",
+		.mask = SND_JACK_HEADPHONE,
+	},
+};
+
+static const struct snd_kcontrol_new skylake_controls[] = {
+	SOC_DAPM_PIN_SWITCH("Speaker"),
+	SOC_DAPM_PIN_SWITCH("Headphone Jack"),
+	SOC_DAPM_PIN_SWITCH("Mic Jack"),
+};
+
+static const struct snd_soc_dapm_widget skylake_widgets[] = {
+	SND_SOC_DAPM_HP("Headphone Jack", NULL),
+	SND_SOC_DAPM_SPK("Speaker", NULL),
+	SND_SOC_DAPM_MIC("Mic Jack", NULL),
+	SND_SOC_DAPM_MIC("DMIC2", NULL),
+	SND_SOC_DAPM_MIC("SoC DMIC", NULL),
+};
+
+static const struct snd_soc_dapm_route skylake_rt286_map[] = {
+	/* speaker */
+	{"Speaker", NULL, "SPOR"},
+	{"Speaker", NULL, "SPOL"},
+
+	/* HP jack connectors - unknown if we have jack deteck */
+	{"Headphone Jack", NULL, "HPO Pin"},
+
+	/* other jacks */
+	{"MIC1", NULL, "Mic Jack"},
+
+	/* digital mics */
+	{"DMIC1 Pin", NULL, "DMIC2"},
+	{"DMIC AIF", NULL, "SoC DMIC"},
+
+	/* CODEC BE connections */
+	{ "AIF1 Playback", NULL, "ssp0 Tx"},
+	{ "ssp0 Tx", NULL, "codec0_out"},
+	{ "ssp0 Tx", NULL, "codec1_out"},
+
+	{ "codec0_in", NULL, "ssp0 Rx" },
+	{ "codec1_in", NULL, "ssp0 Rx" },
+	{ "ssp0 Rx", NULL, "AIF1 Capture" },
+
+	{ "dmic01_hifi", NULL, "DMIC01 Rx" },
+	{ "DMIC01 Rx", NULL, "Capture" },
+
+	{ "hif1", NULL, "iDisp Tx"},
+	{ "iDisp Tx", NULL, "iDisp_out"},
+
+};
+
+static int skylake_rt286_codec_init(struct snd_soc_pcm_runtime *rtd)
+{
+	struct snd_soc_codec *codec = rtd->codec;
+	int ret;
+
+	ret = snd_soc_card_jack_new(rtd->card, "Headset",
+		SND_JACK_HEADSET | SND_JACK_BTN_0,
+		&skylake_headset,
+		skylake_headset_pins, ARRAY_SIZE(skylake_headset_pins));
+
+	if (ret)
+		return ret;
+
+	rt286_mic_detect(codec, &skylake_headset);
+
+	return 0;
+}
+
+
+static int skylake_ssp0_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);
+
+	/* The output is 48KHz, stereo, 16bits */
+	rate->min = rate->max = 48000;
+	channels->min = channels->max = 2;
+	snd_mask_set(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT -
+				    SNDRV_PCM_HW_PARAM_FIRST_MASK],
+				    SNDRV_PCM_FORMAT_S16_LE);
+
+	return 0;
+}
+
+static int skylake_rt286_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, RT286_SCLK_S_PLL, 24000000,
+		SND_SOC_CLOCK_IN);
+	if (ret < 0)
+		dev_err(rtd->dev, "set codec sysclk failed: %d\n", ret);
+
+	return ret;
+}
+
+static struct snd_soc_ops skylake_rt286_ops = {
+	.hw_params = skylake_rt286_hw_params,
+};
+
+/* skylake digital audio interface glue - connects codec <--> CPU */
+static struct snd_soc_dai_link skylake_rt286_dais[] = {
+	/* Front End DAI links */
+	{
+		.name = "Skl Audio Port",
+		.stream_name = "Audio",
+		.cpu_dai_name = "System Pin",
+		.platform_name = "0000:00:1f.3",
+		.nonatomic = 1,
+		.dynamic = 1,
+		.codec_name = "snd-soc-dummy",
+		.codec_dai_name = "snd-soc-dummy-dai",
+		.trigger = {
+			SND_SOC_DPCM_TRIGGER_POST,
+			SND_SOC_DPCM_TRIGGER_POST
+		},
+		.dpcm_playback = 1,
+	},
+	{
+		.name = "Skl Audio Capture Port",
+		.stream_name = "Audio Record",
+		.cpu_dai_name = "System Pin",
+		.platform_name = "0000:00:1f.3",
+		.nonatomic = 1,
+		.dynamic = 1,
+		.codec_name = "snd-soc-dummy",
+		.codec_dai_name = "snd-soc-dummy-dai",
+		.trigger = {
+			SND_SOC_DPCM_TRIGGER_POST,
+			SND_SOC_DPCM_TRIGGER_POST
+		},
+		.dpcm_capture = 1,
+	},
+	{
+		.name = "Skl Audio Reference cap",
+		.stream_name = "refcap",
+		.cpu_dai_name = "Reference Pin",
+		.codec_name = "snd-soc-dummy",
+		.codec_dai_name = "snd-soc-dummy-dai",
+		.platform_name = "0000:00:1f.3",
+		.init = NULL,
+		.dpcm_capture = 1,
+		.ignore_suspend = 1,
+		.nonatomic = 1,
+		.dynamic = 1,
+	},
+
+	/* Back End DAI links */
+	{
+		/* SSP0 - Codec */
+		.name = "SSP0-Codec",
+		.be_id = 0,
+		.cpu_dai_name = "SSP0 Pin",
+		.platform_name = "0000:00:1f.3",
+		.no_pcm = 1,
+		.codec_name = "i2c-INT343A:00",
+		.codec_dai_name = "rt286-aif1",
+		.init = skylake_rt286_codec_init,
+		.dai_fmt = SND_SOC_DAIFMT_I2S |
+			SND_SOC_DAIFMT_NB_NF |
+			SND_SOC_DAIFMT_CBS_CFS,
+		.ignore_suspend = 1,
+		.ignore_pmdown_time = 1,
+		.be_hw_params_fixup = skylake_ssp0_fixup,
+		.ops = &skylake_rt286_ops,
+		.dpcm_playback = 1,
+		.dpcm_capture = 1,
+	},
+	{
+		.name = "dmic01",
+		.be_id = 1,
+		.cpu_dai_name = "DMIC01 Pin",
+		.codec_name = "dmic-codec",
+		.codec_dai_name = "dmic-hifi",
+		.platform_name = "0000:00:1f.3",
+		.ignore_suspend = 1,
+		.dpcm_capture = 1,
+		.no_pcm = 1,
+	},
+};
+
+/* skylake audio machine driver for SPT + RT286S */
+static struct snd_soc_card skylake_rt286 = {
+	.name = "skylake-rt286",
+	.owner = THIS_MODULE,
+	.dai_link = skylake_rt286_dais,
+	.num_links = ARRAY_SIZE(skylake_rt286_dais),
+	.controls = skylake_controls,
+	.num_controls = ARRAY_SIZE(skylake_controls),
+	.dapm_widgets = skylake_widgets,
+	.num_dapm_widgets = ARRAY_SIZE(skylake_widgets),
+	.dapm_routes = skylake_rt286_map,
+	.num_dapm_routes = ARRAY_SIZE(skylake_rt286_map),
+	.fully_routed = true,
+};
+
+static int skylake_audio_probe(struct platform_device *pdev)
+{
+	skylake_rt286.dev = &pdev->dev;
+
+	return snd_soc_register_card(&skylake_rt286);
+}
+
+static int skylake_audio_remove(struct platform_device *pdev)
+{
+	snd_soc_unregister_card(&skylake_rt286);
+	return 0;
+}
+
+static struct platform_driver skylake_audio = {
+	.probe = skylake_audio_probe,
+	.remove = skylake_audio_remove,
+	.driver = {
+		.name = "skl_alc286s_i2s",
+	},
+};
+
+module_platform_driver(skylake_audio)
+
+/* Module information */
+MODULE_AUTHOR("Omair Mohammed Abdullah <omair.m.abdullah@intel.com>");
+MODULE_DESCRIPTION("Intel SST Audio for Skylake");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:skl_alc286s_i2s");
-- 
2.4.3

Re: [PATCH] ASoC: Intel: Skylake - Add Skylake RT286 I2S machine driver

[kbuild test robot]

Hi Omair,

[auto build test WARNING on next-20151009 -- if it's inappropriate base, please ignore]

reproduce:
        # apt-get install sparse
        make ARCH=x86_64 allmodconfig
        make C=1 CF=-D__CHECK_ENDIAN__


sparse warnings: (new ones prefixed by >>)

>> sound/soc/intel/skylake/skl-sst-cldma.c:48:24: sparse: incorrect type in assignment (different base types)
   sound/soc/intel/skylake/skl-sst-cldma.c:48:24:    expected unsigned int [unsigned] [usertype] <noident>
   sound/soc/intel/skylake/skl-sst-cldma.c:48:24:    got restricted __le32 [usertype] <noident>
   sound/soc/intel/skylake/skl-sst-cldma.c:49:24: sparse: incorrect type in assignment (different base types)
   sound/soc/intel/skylake/skl-sst-cldma.c:49:24:    expected unsigned int [unsigned] [usertype] <noident>
   sound/soc/intel/skylake/skl-sst-cldma.c:49:24:    got restricted __le32 [usertype] <noident>
   sound/soc/intel/skylake/skl-sst-cldma.c:51:24: sparse: incorrect type in assignment (different base types)
   sound/soc/intel/skylake/skl-sst-cldma.c:51:24:    expected unsigned int [unsigned] [usertype] <noident>
   sound/soc/intel/skylake/skl-sst-cldma.c:51:24:    got restricted __le32 [usertype] <noident>
>> sound/soc/intel/skylake/skl-sst-cldma.c:54:24: sparse: incorrect type in assignment (different base types)
   sound/soc/intel/skylake/skl-sst-cldma.c:54:24:    expected unsigned int [unsigned] [usertype] <noident>
   sound/soc/intel/skylake/skl-sst-cldma.c:54:24:    got restricted __le32

vim +48 sound/soc/intel/skylake/skl-sst-cldma.c

914426c8 Vinod Koul 2015-07-10  42  
914426c8 Vinod Koul 2015-07-10  43  	ctx->cl_dev.frags = 0;
914426c8 Vinod Koul 2015-07-10  44  	while (size > 0) {
914426c8 Vinod Koul 2015-07-10  45  		phys_addr_t addr = virt_to_phys(dmab_data->area +
914426c8 Vinod Koul 2015-07-10  46  				(ctx->cl_dev.frags * ctx->cl_dev.bufsize));
914426c8 Vinod Koul 2015-07-10  47  
914426c8 Vinod Koul 2015-07-10 @48  		bdl[0] = cpu_to_le32(lower_32_bits(addr));
914426c8 Vinod Koul 2015-07-10  49  		bdl[1] = cpu_to_le32(upper_32_bits(addr));
914426c8 Vinod Koul 2015-07-10  50  
914426c8 Vinod Koul 2015-07-10  51  		bdl[2] = cpu_to_le32(ctx->cl_dev.bufsize);
914426c8 Vinod Koul 2015-07-10  52  
914426c8 Vinod Koul 2015-07-10  53  		size -= ctx->cl_dev.bufsize;
914426c8 Vinod Koul 2015-07-10 @54  		bdl[3] = (size || !with_ioc) ? 0 : cpu_to_le32(0x01);
914426c8 Vinod Koul 2015-07-10  55  
914426c8 Vinod Koul 2015-07-10  56  		bdl += 4;
914426c8 Vinod Koul 2015-07-10  57  		ctx->cl_dev.frags++;

:::::: The code at line 48 was first introduced by commit
:::::: 914426c8657c1e934b015ffa32e7bfd0cb34f47f ASoC: Intel: Skylake: add code loader DMA operations

:::::: TO: Vinod Koul <vinod.koul@intel.com>
:::::: CC: Mark Brown <broonie@kernel.org>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

Re: [PATCH] ASoC: Intel: Skylake - Add Skylake RT286 I2S machine driver

[Koul, Vinod]

On Sat, 2015-10-10 at 16:42 +0800, kbuild test robot wrote:
> Hi Omair,
> 
> [auto build test ERROR on next-20151009 -- if it's inappropriate base, please
> ignore]
> 
> config: arm-allmodconfig (attached as .config)
> reproduce:

That's nice, thanks. We should add a depends on X86 for this to not compile on non
X86 code

Will send updated patch

-- 
~Vinod

Re: [PATCH] ASoC: Intel: Skylake - Add Skylake RT286 I2S machine driver

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 646 bytes --]

On Mon, Oct 12, 2015 at 03:12:07AM +0000, Koul, Vinod wrote:
> On Sat, 2015-10-10 at 16:42 +0800, kbuild test robot wrote:

> > [auto build test ERROR on next-20151009 -- if it's inappropriate base, please
> > ignore]

> > config: arm-allmodconfig (attached as .config)
> > reproduce:

> That's nice, thanks. We should add a depends on X86 for this to not compile on non
> X86 code

> Will send updated patch

It looks like the missing functions are just readl() and writel() which
means that they're probably only working on x86 through implicit
inclusion rather than intentionally - if that's the case adding (IIRC)
linux/io.h is a better fix.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] ASoC: Intel: Skylake - Add Skylake RT286 I2S machine driver

[Vinod Koul]

[-- Attachment #1.1: Type: text/plain, Size: 892 bytes --]

On Mon, Oct 12, 2015 at 05:17:36PM +0100, Mark Brown wrote:
> On Mon, Oct 12, 2015 at 03:12:07AM +0000, Koul, Vinod wrote:
> > On Sat, 2015-10-10 at 16:42 +0800, kbuild test robot wrote:
> 
> > > [auto build test ERROR on next-20151009 -- if it's inappropriate base, please
> > > ignore]
> 
> > > config: arm-allmodconfig (attached as .config)
> > > reproduce:
> 
> > That's nice, thanks. We should add a depends on X86 for this to not compile on non
> > X86 code
> 
> > Will send updated patch
> 
> It looks like the missing functions are just readl() and writel() which
> means that they're probably only working on x86 through implicit
> inclusion rather than intentionally - if that's the case adding (IIRC)
> linux/io.h is a better fix.
Yes relooking at this, I do agree that seems to be doable.
Let me try that and see if we can get this to build :)

-- 
~Vinod

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] ASoC: Intel: Skylake - Add Skylake RT286 I2S machine driver

[Vinod Koul]

[-- Attachment #1.1: Type: text/plain, Size: 1070 bytes --]

On Mon, Oct 12, 2015 at 10:02:25PM +0530, Vinod Koul wrote:
> On Mon, Oct 12, 2015 at 05:17:36PM +0100, Mark Brown wrote:
> > On Mon, Oct 12, 2015 at 03:12:07AM +0000, Koul, Vinod wrote:
> > > On Sat, 2015-10-10 at 16:42 +0800, kbuild test robot wrote:
> > 
> > > > [auto build test ERROR on next-20151009 -- if it's inappropriate base, please
> > > > ignore]
> > 
> > > > config: arm-allmodconfig (attached as .config)
> > > > reproduce:
> > 
> > > That's nice, thanks. We should add a depends on X86 for this to not compile on non
> > > X86 code
> > 
> > > Will send updated patch
> > 
> > It looks like the missing functions are just readl() and writel() which
> > means that they're probably only working on x86 through implicit
> > inclusion rather than intentionally - if that's the case adding (IIRC)
> > linux/io.h is a better fix.
> Yes relooking at this, I do agree that seems to be doable.
> Let me try that and see if we can get this to build :)
And will need depends on ACPI for acpi_ routines, so need to add that too

-- 
~Vinod

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]