ASoC: max98357a: Add ACPI ID for Maxim
Subsystems (3)
PATCH 1/8 ASoC: max98357a: Add ACPI ID for Maxim
From: Rohit Ainapure <[email protected]>
Adding ACPI ID "MX98357A" for the MAXIM 98357A amp.
--- sound/soc/codecs/max98357a.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
sound/soc/codecs/max98357a.c +10 -0
@@ -12,6 +12,7 @@* max98357a.c -- MAX98357A ALSA SoC Codec driver */ +#include <linux/acpi.h> #include <linux/device.h> #include <linux/err.h> #include <linux/gpio.h>
@@ -123,10 +124,19 @@ static const struct of_device_id max98357a_device_id[] = {MODULE_DEVICE_TABLE (of, max98357a_device_id);#endif +#ifdef CONFIG_ACPI +static const struct acpi_device_id max98357a_acpi_match[] = { + {"MX98357A" ,0 }, + {}, +}; +MODULE_DEVICE_TABLE (acpi, max98357a_acpi_match); +#endif +static struct platform_driver max98357a_platform_driver = { .driver = { .name ="max98357a" , .of_match_table =of_match_ptr (max98357a_device_id), + .acpi_match_table =ACPI_PTR (max98357a_acpi_match), }, .probe = max98357a_platform_probe, .remove = max98357a_platform_remove,
Signature · 1 line
1.7.9.5
PATCH 2/8 ASoC: Intel: Add Nuvoton+Maxim machine driver entry
From: Rohit Ainapure <[email protected]>
Add the NAU88L25 + MAX98357A machine driver entry into the machine table
--- sound/soc/intel/skylake/skl.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/intel/skylake/skl.c +2 -0
@@ -600,6 +600,8 @@ static struct sst_acpi_mach sst_skl_devdata[] = { { "INT343A", "skl_alc286s_i2s", "intel/dsp_fw_release.bin", NULL, NULL, NULL }, { "INT343B", "skl_nau88l25_ssm4567_i2s", "intel/dsp_fw_release.bin", NULL, NULL, NULL }, + { "MX98357A", "skl_nau88l25_max98357a_i2s", "intel/dsp_fw_release.bin", + NULL, NULL, NULL }, {} };
Signature · 1 line
1.7.9.5
Mark Brown
maintainerApplied "ASoC: Intel: Add Nuvoton+Maxim machine driver entry" to the asoc tree
The patch
ASoC: Intel: Add Nuvoton+Maxim machine driver entry
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
69b7f9c45856e49929bdde8492e5f46a07c8a2f3Mon Sep 17 00:00:00 2001
From: Rohit Ainapure <[email protected]>
Date: Fri, 11 Dec 2015 11:29:07 -0800
Subject: [PATCH] ASoC: Intel: Add Nuvoton+Maxim machine driver entry
Add the NAU88L25 + MAX98357A machine driver entry into the machine table
--- sound/soc/intel/skylake/skl.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/intel/skylake/skl.c +2 -0
@@ -600,6 +600,8 @@ static struct sst_acpi_mach sst_skl_devdata[] = { { "INT343A", "skl_alc286s_i2s", "intel/dsp_fw_release.bin", NULL, NULL, NULL }, { "INT343B", "skl_nau88l25_ssm4567_i2s", "intel/dsp_fw_release.bin", NULL, NULL, NULL }, + { "MX98357A", "skl_nau88l25_max98357a_i2s", "intel/dsp_fw_release.bin", + NULL, NULL, NULL }, {} };
Signature · 1 line
2.6.2
PATCH 3/8 ASoC: Intel: Skylake: Add Nuvoton Maxim machine driver
In reply to [email protected]From: Rohit Ainapure <[email protected]>
This adds Skylake I2S machine driver which uses NAU88L25 as anlog codec and MAX98357A as speakers
--- sound/soc/intel/Kconfig | 14 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 485 +++++++++++++++++++++++ 3 files changed, 501 insertions(+) create mode 100644 sound/soc/intel/boards/skl_nau88l25_max98357a.c
sound/soc/intel/Kconfig +14 -0
@@ -169,3 +169,17 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH create an alsa sound card for NAU88L25 + SSM4567. Say Y if you have such a device If unsure select "N". + +config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH + tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode" + depends on X86_INTEL_LPSS && I2C + select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_NAU8825 + select SND_SOC_MAX98357A + select SND_SOC_DMIC + help + This adds support for ASoC Onboard Codec I2S machine driver. This will + create an alsa sound card for NAU88L25 + MAX98357A. + Say Y if you have such a device + If unsure select "N".
sound/soc/intel/boards/Makefile +2 -0
@@ -7,6 +7,7 @@ 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 +snd-skl_nau88l25_max98357a-objs := skl_nau88l25_max98357a.o snd-soc-skl_nau88l25_ssm4567-objs := skl_nau88l25_ssm4567.o obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o
@@ -18,4 +19,5 @@ 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 +obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH) += snd-skl_nau88l25_max98357a.o obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH) += snd-soc-skl_nau88l25_ssm4567.o
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +485 -0
485 lines not on this page · raw message
Signature · 1 line
1.7.9.5
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: Add Nuvoton Maxim machine driver" to the asoc tree
The patch
ASoC: Intel: Skylake: Add Nuvoton Maxim machine driver
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
8eaf2b31dd316ff5ffbdad14853d2bf8779bab13Mon Sep 17 00:00:00 2001
From: Rohit Ainapure <[email protected]>
Date: Fri, 11 Dec 2015 11:29:08 -0800
Subject: [PATCH] ASoC: Intel: Skylake: Add Nuvoton Maxim machine driver
This adds Skylake I2S machine driver which uses NAU88L25 as anlog codec and MAX98357A as speakers
--- sound/soc/intel/Kconfig | 14 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 485 ++++++++++++++++++++++++ 3 files changed, 501 insertions(+) create mode 100644 sound/soc/intel/boards/skl_nau88l25_max98357a.c
sound/soc/intel/Kconfig +14 -0
@@ -169,3 +169,17 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH create an alsa sound card for NAU88L25 + SSM4567. Say Y if you have such a device If unsure select "N". + +config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH + tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode" + depends on X86_INTEL_LPSS && I2C + select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_NAU8825 + select SND_SOC_MAX98357A + select SND_SOC_DMIC + help + This adds support for ASoC Onboard Codec I2S machine driver. This will + create an alsa sound card for NAU88L25 + MAX98357A. + Say Y if you have such a device + If unsure select "N".
sound/soc/intel/boards/Makefile +2 -0
@@ -7,6 +7,7 @@ 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 +snd-skl_nau88l25_max98357a-objs := skl_nau88l25_max98357a.o snd-soc-skl_nau88l25_ssm4567-objs := skl_nau88l25_ssm4567.o obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o
@@ -18,4 +19,5 @@ 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 +obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH) += snd-skl_nau88l25_max98357a.o obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH) += snd-soc-skl_nau88l25_ssm4567.o
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +485 -0
485 lines not on this page · raw message
Signature · 1 line
2.6.2
Re: [PATCH 3/8] ASoC: Intel: Skylake: Add Nuvoton Maxim machine driver
In reply to [email protected]Hi Yang
Quoted 20 lines · On Fri, Dec 11, 2015 at 11:29 AM, <[email protected]> wrote:
From: Rohit Ainapure <[email protected]>
This adds Skylake I2S machine driver which uses NAU88L25 as anlog codec and MAX98357A as speakers
Signed-off-by Rohit Ainapure <[email protected]>Signed-off-by Fang, Yang A <[email protected]>Signed-off-by Vinod Koul <[email protected]>--- sound/soc/intel/Kconfig | 14 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 485 +++++++++++++++++++++++ 3 files changed, 501 insertions(+) create mode 100644 sound/soc/intel/boards/skl_nau88l25_max98357a.csound/soc/intel/Kconfig +0
-0
sound/soc/intel/Kconfig config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH · line 174
Quoted 6 lines
sound/soc/intel/Kconfig +3
-0@@ -169,3 +169,17 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH create an alsa sound card for NAU88L25 + SSM4567. Say Y if you have such a device If unsure select "N". + +config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH + tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode"
I there any reason you keep using inconsistent name for this IC. The original driver uses "NAU8825" name and the one above is "NAU88L25".
Please keep naming consistent. The driver chip should be names either NAU8825 or NAU88L25 but it has to be done everywhere.
I had this question to Vinod earlier as well sent NAU88L25 -> NAU8825 rename patch but got no reply.
Quoted 527 lines
sound/soc/intel/Kconfig +11
-0+ depends on X86_INTEL_LPSS && I2C + select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_NAU8825 + select SND_SOC_MAX98357A + select SND_SOC_DMIC + help + This adds support for ASoC Onboard Codec I2S machine driver. This will + create an alsa sound card for NAU88L25 + MAX98357A. + Say Y if you have such a device + If unsure select "N".sound/soc/intel/boards/Makefile +2
-0@@ -7,6 +7,7 @@ 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 +snd-skl_nau88l25_max98357a-objs := skl_nau88l25_max98357a.o snd-soc-skl_nau88l25_ssm4567-objs := skl_nau88l25_ssm4567.o obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o@@ -18,4 +19,5 @@ 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 +obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH) += snd-skl_nau88l25_max98357a.o obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH) += snd-soc-skl_nau88l25_ssm4567.osound/soc/intel/boards/skl_nau88l25_max98357a.c new file +485
-1@@ -0,0 +1,485 @@ +/* +* Intel Skylake I2S Machine Driver with MAXIM98357A +* and NAU88L25 +* +* Copyright (C) 2015, 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/jack.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include "../../codecs/nau8825.h" + +#define SKL_NUVOTON_CODEC_DAI "nau8825-hifi" +#define SKL_MAXIM_CODEC_DAI "HiFi" + +static struct snd_soc_jack skylake_headset; +static struct snd_soc_card skylake_audio_card; + +static inline struct snd_soc_dai *skl_get_codec_dai (struct snd_soc_card *card) +{ +struct snd_soc_pcm_runtime *rtd; + +list_for_each_entry (rtd, &card->rtd_list, list) { + +if (!strncmp (rtd->codec_dai->name,SKL_NUVOTON_CODEC_DAI , +strlen (SKL_NUVOTON_CODEC_DAI ))) +return rtd->codec_dai; + } + +return NULL ; +} + +static int platform_clock_control (struct snd_soc_dapm_widget *w, +struct snd_kcontrol *k,int event) +{ +struct snd_soc_dapm_context *dapm = w->dapm; +struct snd_soc_card *card = dapm->card; +struct snd_soc_dai *codec_dai; +int ret; + + codec_dai =skl_get_codec_dai (card); +if (!codec_dai) { +dev_err (card->dev,"Codec dai not found; Unable to set platform clock\n" ); +return -EIO ; + } + +if (SND_SOC_DAPM_EVENT_ON (event)) { + ret =snd_soc_dai_set_sysclk (codec_dai, +NAU8825_CLK_MCLK ,24000000 ,SND_SOC_CLOCK_IN ); +if (ret <0 ) { +dev_err (card->dev,"set sysclk err = %d\n" , ret); +return -EIO ; + } + }else { + ret =snd_soc_dai_set_sysclk (codec_dai, +NAU8825_CLK_INTERNAL ,0 ,SND_SOC_CLOCK_IN ); +if (ret <0 ) { +dev_err (card->dev,"set sysclk err = %d\n" , ret); +return -EIO ; + } + } + +return ret; +} + +static const struct snd_kcontrol_new skylake_controls[] = { +SOC_DAPM_PIN_SWITCH ("Headphone Jack" ), +SOC_DAPM_PIN_SWITCH ("Headset Mic" ), +SOC_DAPM_PIN_SWITCH ("Spk" ), +}; + +static const struct snd_soc_dapm_widget skylake_widgets[] = { +SND_SOC_DAPM_HP ("Headphone Jack" ,NULL ), +SND_SOC_DAPM_MIC ("Headset Mic" ,NULL ), +SND_SOC_DAPM_SPK ("Spk" ,NULL ), +SND_SOC_DAPM_MIC ("SoC DMIC" ,NULL ), +SND_SOC_DAPM_SINK ("WoV Sink" ), +SND_SOC_DAPM_SPK ("DP" ,NULL ), +SND_SOC_DAPM_SPK ("HDMI" ,NULL ), +SND_SOC_DAPM_SUPPLY ("Platform Clock" ,SND_SOC_NOPM ,0 ,0 , + platform_clock_control,SND_SOC_DAPM_PRE_PMU | +SND_SOC_DAPM_POST_PMD ), +}; + +static const struct snd_soc_dapm_route skylake_map[] = { +/* HP jack connectors - unknown if we have jack detection */ + {"Headphone Jack" ,NULL ,"HPOL" }, + {"Headphone Jack" ,NULL ,"HPOR" }, + +/* speaker */ + {"Spk" ,NULL ,"Speaker" }, + +/* other jacks */ + {"MIC" ,NULL ,"Headset Mic" }, + {"DMic" ,NULL ,"SoC DMIC" }, + + {"WoV Sink" ,NULL ,"hwd_in sink" }, + {"HDMI" ,NULL ,"hif5 Output" }, + {"DP" ,NULL ,"hif6 Output" }, + +/* CODEC BE connections */ + {"HiFi Playback" ,NULL ,"ssp0 Tx" }, + {"ssp0 Tx" ,NULL ,"codec0_out" }, + + {"Playback" ,NULL ,"ssp1 Tx" }, + {"ssp1 Tx" ,NULL ,"codec1_out" }, + + {"codec0_in" ,NULL ,"ssp1 Rx" }, + {"ssp1 Rx" ,NULL ,"Capture" }, + +/* DMIC */ + {"dmic01_hifi" ,NULL ,"DMIC01 Rx" }, + {"DMIC01 Rx" ,NULL ,"DMIC AIF" }, + {"hifi1" ,NULL ,"iDisp Tx" }, + {"iDisp Tx" ,NULL ,"iDisp_out" }, + {"Headphone Jack" ,NULL ,"Platform Clock" }, + {"Headset Mic" ,NULL ,"Platform Clock" }, +}; + +static int skylake_ssp_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 ADSP will covert the FE rate to 48k, stereo */ + rate->min = rate->max =48000 ; + channels->min = channels->max =2 ; + +/* set SSP0 to 24 bit */ +snd_mask_none (fmt); +snd_mask_set (fmt,SNDRV_PCM_FORMAT_S24_LE ); + +return 0 ; +} + +static int skylake_nau8825_codec_init (struct snd_soc_pcm_runtime *rtd) +{ +int ret; +struct snd_soc_codec *codec = rtd->codec; + +/* +* Headset buttons map to the google Reference headset. +* These can be configured by userspace. +*/ + ret =snd_soc_card_jack_new (&skylake_audio_card,"Headset Jack" , +SND_JACK_HEADSET |SND_JACK_BTN_0 |SND_JACK_BTN_1 | +SND_JACK_BTN_2 |SND_JACK_BTN_3 , &skylake_headset, +NULL ,0 ); +if (ret) { +dev_err (rtd->dev,"Headset Jack creation failed %d\n" , ret); +return ret; + } + +nau8825_enable_jack_detect (codec, &skylake_headset); + +snd_soc_dapm_ignore_suspend (&rtd->card->dapm,"SoC DMIC" ); +snd_soc_dapm_ignore_suspend (&rtd->card->dapm,"WoV Sink" ); + +return ret; +} + +static int skylake_nau8825_fe_init (struct snd_soc_pcm_runtime *rtd) +{ +struct snd_soc_dapm_context *dapm; +struct snd_soc_component *component = rtd->cpu_dai->component; + + dapm =snd_soc_component_get_dapm (component); +snd_soc_dapm_ignore_suspend (dapm,"Reference Capture" ); + +return 0 ; +} + +static unsigned int rates[] = { +48000 , +}; + +static struct snd_pcm_hw_constraint_list constraints_rates = { + .count =ARRAY_SIZE (rates), + .list = rates, + .mask =0 , +}; + +static unsigned int channels[] = { +2 , +}; + +static struct snd_pcm_hw_constraint_list constraints_channels = { + .count =ARRAY_SIZE (channels), + .list = channels, + .mask =0 , +}; + +static int skl_fe_startup (struct snd_pcm_substream *substream) +{ +struct snd_pcm_runtime *runtime = substream->runtime; + +/* +* On this platform for PCM device we support, +* 48Khz +* stereo +* 16 bit audio +*/ + + runtime->hw.channels_max =2 ; +snd_pcm_hw_constraint_list (runtime,0 ,SNDRV_PCM_HW_PARAM_CHANNELS , + &constraints_channels); + + runtime->hw.formats =SNDRV_PCM_FMTBIT_S16_LE ; +snd_pcm_hw_constraint_msbits (runtime,0 ,16 ,16 ); + +snd_pcm_hw_constraint_list (runtime,0 , +SNDRV_PCM_HW_PARAM_RATE , &constraints_rates); + +return 0 ; +} + +static const struct snd_soc_ops skylake_nau8825_fe_ops = { + .startup = skl_fe_startup, +}; + +static int skylake_nau8825_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, +NAU8825_CLK_MCLK ,24000000 ,SND_SOC_CLOCK_IN ); + +if (ret <0 ) +dev_err (rtd->dev,"snd_soc_dai_set_sysclk err = %d\n" , ret); + +return ret; +} + +static struct snd_soc_ops skylake_nau8825_ops = { + .hw_params = skylake_nau8825_hw_params, +}; + +static int skylake_dmic_fixup (struct snd_soc_pcm_runtime *rtd, +struct snd_pcm_hw_params *params) +{ +struct snd_interval *channels =hw_param_interval (params, +SNDRV_PCM_HW_PARAM_CHANNELS ); + +if (params_channels (params) ==2 ) + channels->min = channels->max =2 ; +else + channels->min = channels->max =4 ; + +return 0 ; +} + +static unsigned int channels_dmic[] = { +2 ,4 , +}; + +static struct snd_pcm_hw_constraint_list constraints_dmic_channels = { + .count =ARRAY_SIZE (channels_dmic), + .list = channels_dmic, + .mask =0 , +}; + +static int skylake_dmic_startup (struct snd_pcm_substream *substream) +{ +struct snd_pcm_runtime *runtime = substream->runtime; + + runtime->hw.channels_max =4 ; +snd_pcm_hw_constraint_list (runtime,0 ,SNDRV_PCM_HW_PARAM_CHANNELS , + &constraints_dmic_channels); + +return snd_pcm_hw_constraint_list (substream->runtime,0 , +SNDRV_PCM_HW_PARAM_RATE , &constraints_rates); +} + +static struct snd_soc_ops skylake_dmic_ops = { + .startup = skylake_dmic_startup, +}; + +static unsigned int rates_16000[] = { +16000 , +}; + +static struct snd_pcm_hw_constraint_list constraints_16000 = { + .count =ARRAY_SIZE (rates_16000), + .list = rates_16000, +}; + +static int skylake_refcap_startup (struct snd_pcm_substream *substream) +{ +return snd_pcm_hw_constraint_list (substream->runtime,0 , +SNDRV_PCM_HW_PARAM_RATE , + &constraints_16000); +} + +static struct snd_soc_ops skylaye_refcap_ops = { + .startup = skylake_refcap_startup, +}; + +/* skylake digital audio interface glue - connects codec <--> CPU */ +static struct snd_soc_dai_link skylake_dais[] = { +/* Front End DAI links */ + { + .name ="Skl Audio Port" , + .stream_name ="Audio" , + .cpu_dai_name ="System Pin" , + .platform_name ="0000:00:1f.3" , + .dynamic =1 , + .codec_name ="snd-soc-dummy" , + .codec_dai_name ="snd-soc-dummy-dai" , + .nonatomic =1 , + .init = skylake_nau8825_fe_init, + .trigger = { +SND_SOC_DPCM_TRIGGER_POST ,SND_SOC_DPCM_TRIGGER_POST }, + .dpcm_playback =1 , + .ops = &skylake_nau8825_fe_ops, + }, + { + .name ="Skl Audio Capture Port" , + .stream_name ="Audio Record" , + .cpu_dai_name ="System Pin" , + .platform_name ="0000:00:1f.3" , + .dynamic =1 , + .codec_name ="snd-soc-dummy" , + .codec_dai_name ="snd-soc-dummy-dai" , + .nonatomic =1 , + .trigger = { +SND_SOC_DPCM_TRIGGER_POST ,SND_SOC_DPCM_TRIGGER_POST }, + .dpcm_capture =1 , + .ops = &skylake_nau8825_fe_ops, + }, + { + .name ="Skl Audio Reference cap" , + .stream_name ="Wake on Voice" , + .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 , + .ops = &skylaye_refcap_ops, + }, + { + .name ="Skl Audio DMIC cap" , + .stream_name ="dmiccap" , + .cpu_dai_name ="DMIC Pin" , + .codec_name ="snd-soc-dummy" , + .codec_dai_name ="snd-soc-dummy-dai" , + .platform_name ="0000:00:1f.3" , + .init =NULL , + .dpcm_capture =1 , + .nonatomic =1 , + .dynamic =1 , + .ops = &skylake_dmic_ops, + }, + { + .name ="Skl HDMI Port" , + .stream_name ="Hdmi" , + .cpu_dai_name ="HDMI Pin" , + .codec_name ="snd-soc-dummy" , + .codec_dai_name ="snd-soc-dummy-dai" , + .platform_name ="0000:00:1f.3" , + .dpcm_playback =1 , + .init =NULL , + .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 ="MX98357A:00" , + .codec_dai_name =SKL_MAXIM_CODEC_DAI , + .dai_fmt =SND_SOC_DAIFMT_I2S | +SND_SOC_DAIFMT_NB_NF | +SND_SOC_DAIFMT_CBS_CFS , + .ignore_pmdown_time =1 , + .be_hw_params_fixup = skylake_ssp_fixup, + .dpcm_playback =1 , + }, + { +/* SSP1 - Codec */ + .name ="SSP1-Codec" , + .be_id =0 , + .cpu_dai_name ="SSP1 Pin" , + .platform_name ="0000:00:1f.3" , + .no_pcm =1 , + .codec_name ="i2c-10508825:00" , + .codec_dai_name =SKL_NUVOTON_CODEC_DAI , + .init = skylake_nau8825_codec_init, + .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | +SND_SOC_DAIFMT_CBS_CFS , + .ignore_pmdown_time =1 , + .be_hw_params_fixup = skylake_ssp_fixup, + .ops = &skylake_nau8825_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" , + .be_hw_params_fixup = skylake_dmic_fixup, + .ignore_suspend =1 , + .dpcm_capture =1 , + .no_pcm =1 , + }, + { + .name ="iDisp" , + .be_id =3 , + .cpu_dai_name ="iDisp Pin" , + .codec_name ="ehdaudio0D2" , + .codec_dai_name ="intel-hdmi-hifi1" , + .platform_name ="0000:00:1f.3" , + .dpcm_playback =1 , + .no_pcm =1 , + }, +}; + +/* skylake audio machine driver for SPT + NAU88L25 */ +static struct snd_soc_card skylake_audio_card = { + .name ="sklnau8825max" , + .owner =THIS_MODULE , + .dai_link = skylake_dais, + .num_links =ARRAY_SIZE (skylake_dais), + .controls = skylake_controls, + .num_controls =ARRAY_SIZE (skylake_controls), + .dapm_widgets = skylake_widgets, + .num_dapm_widgets =ARRAY_SIZE (skylake_widgets), + .dapm_routes = skylake_map, + .num_dapm_routes =ARRAY_SIZE (skylake_map), + .fully_routed = true, +}; + +static int skylake_audio_probe (struct platform_device *pdev) +{ + skylake_audio_card.dev = &pdev->dev; + +return devm_snd_soc_register_card (&pdev->dev, &skylake_audio_card); +} + +static struct platform_driver skylake_audio = { + .probe = skylake_audio_probe, + .driver = { + .name ="skl_nau88l25_max98357a_i2s" , + .pm = &snd_soc_pm_ops, + }, +}; + +module_platform_driver(skylake_audio) + +/* Module information */ +MODULE_DESCRIPTION("Audio Machine driver-NAU88L25 & MAX98357A in I2S mode"); +MODULE_AUTHOR ("Rohit Ainapure <[email protected]" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_ALIAS ("platform:skl_nau88l25_max98357a_i2s" ); --1.7.9.5
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Re: [PATCH 3/8] ASoC: Intel: Skylake: Add Nuvoton Maxim machine driver
Quoted 45 lines
-----Original Message-----
From: Anatol Pomozov [mailto:[email protected]]
Sent: Sunday, December 20, 2015 5:37 PM
To: Fang, Yang A
Cc: Mark Brown; Liam Girdwood; [email protected]; Ainapure, Rohit M; Ausmus, James; Koul, Vinod; Konno, Joe; Nujella, Sathyanarayana; Kp, Jeeja; Patel, Vedang; Zhi, Yong
Subject: Re: [alsa-devel] [PATCH 3/8] ASoC: Intel: Skylake: Add Nuvoton Maxim machine driverHi Yang
sound/soc/intel/Kconfig config
Quoted 21 lines · On Fri, Dec 11, 2015 at 11:29 AM, <[email protected]> wrote:
From: Rohit Ainapure <[email protected]>
This adds Skylake I2S machine driver which uses NAU88L25 as anlog codec and MAX98357A as speakers
Signed-off-by Rohit Ainapure <[email protected]>Signed-off-by Fang, Yang A <[email protected]>Signed-off-by Vinod Koul <[email protected]>--- sound/soc/intel/Kconfig | 14 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 485 +++++++++++++++++++++++ 3 files changed, 501 insertions(+) create mode 100644 sound/soc/intel/boards/skl_nau88l25_max98357a.csound/soc/intel/Kconfig index renamed from sound/soc/intel/Kconfig +0
-02d3b124..9b1c0aa 100644
sound/soc/intel/Kconfig +0
-0@@ -169,3 +169,17 @@ config
SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACHsound/soc/intel/Kconfig config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
Quoted 6 lines
sound/soc/intel/Kconfig +3
-0create an alsa sound card for NAU88L25 + SSM4567. Say Y if you have such a device If unsure select "N". + +config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH + tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A inI2S Mode"
Quoted 6 lines
I there any reason you keep using inconsistent name for this IC. The original driver uses "NAU8825" name and the one above is "NAU88L25".
Please keep naming consistent. The driver chip should be names either NAU8825 or NAU88L25 but it has to be done everywhere.
Hi Anatol
Thanks for the suggestion. I will rename them to reflect correctly
Thanks,
Yang
Quoted 540 lines
I had this question to Vinod earlier as well sent NAU88L25 -> NAU8825 rename patch but got no reply.
sound/soc/intel/Kconfig config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
Quoted 8 lines
sound/soc/intel/Kconfig +8
-0+ depends on X86_INTEL_LPSS && I2C + select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_NAU8825 + select SND_SOC_MAX98357A + select SND_SOC_DMIC + help + This adds support for ASoC Onboard Codec I2S machine driver. Thiswill
Quoted 14 lines
sound/soc/intel/Kconfig +3
-0+ create an alsa sound card for NAU88L25 + MAX98357A. + Say Y if you have such a device + If unsure select "N".(quoted diff) +0
-0b/sound/soc/intel/boards/Makefile index a59f762..2485ea9 100644
sound/soc/intel/boards/Makefile +0
-0@@ -7,6 +7,7 @@ snd-soc-sst-cht-bsw-rt5672-objs := cht_bsw_rt5672.osnd-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 +snd-skl_nau88l25_max98357a-objs := skl_nau88l25_max98357a.o
snd-soc-skl_nau88l25_ssm4567-objs := skl_nau88l25_ssm4567.oQuoted 1 line
obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-
haswell.o @@
Quoted 1 line
-18,4 +19,5 @@ obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH)
+=
Quoted 6 lines
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
Quoted 57 lines
sound/soc/intel/boards/Makefile +2
-0+obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH) += +snd-skl_nau88l25_max98357a.o obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH) +=snd-soc-skl_nau88l25_ssm4567.o diff --git
a/sound/soc/intel/boards/skl_nau88l25_max98357a.cb/sound/soc/intel/boards/skl_nau88l25_max98357a.c
new file mode 100644
index 0000000..ab7da9csound/soc/intel/boards/skl_nau88l25_max98357a.c new file +46
-0@@ -0,0 +1,485 @@ +/* +* Intel Skylake I2S Machine Driver with MAXIM98357A +* and NAU88L25 +* +* Copyright (C) 2015, 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/jack.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include "../../codecs/nau8825.h" + +#define SKL_NUVOTON_CODEC_DAI "nau8825-hifi" +#define SKL_MAXIM_CODEC_DAI "HiFi" + +static struct snd_soc_jack skylake_headset;static struct +snd_soc_card skylake_audio_card; + +static inline struct snd_soc_dai *skl_get_codec_dai (struct +snd_soc_card *card) { +struct snd_soc_pcm_runtime *rtd; + +list_for_each_entry (rtd, &card->rtd_list, list) { + +if (!strncmp (rtd->codec_dai->name,SKL_NUVOTON_CODEC_DAI , +strlen (SKL_NUVOTON_CODEC_DAI ))) +return rtd->codec_dai; + } + +return NULL ; +} +sound/soc/intel/boards/skl_nau88l25_max98357a.c line 56
Quoted 10 lines
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +10
-0+static int platform_clock_control (struct snd_soc_dapm_widget *w, +struct snd_kcontrol *k,int event) { +struct snd_soc_dapm_context *dapm = w->dapm; +struct snd_soc_card *card = dapm->card; +struct snd_soc_dai *codec_dai; +int ret; + + codec_dai =skl_get_codec_dai (card); +if (!codec_dai) { + dev_err(card->dev, "Codec dai not found; Unable to set platformclock\n");
Quoted 95 lines
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +95
-0+return -EIO ; + } + +if (SND_SOC_DAPM_EVENT_ON (event)) { + ret =snd_soc_dai_set_sysclk (codec_dai, +NAU8825_CLK_MCLK ,24000000 ,SND_SOC_CLOCK_IN ); +if (ret <0 ) { +dev_err (card->dev,"set sysclk err = %d\n" , ret); +return -EIO ; + } + }else { + ret =snd_soc_dai_set_sysclk (codec_dai, +NAU8825_CLK_INTERNAL ,0 ,SND_SOC_CLOCK_IN ); +if (ret <0 ) { +dev_err (card->dev,"set sysclk err = %d\n" , ret); +return -EIO ; + } + } + +return ret; +} + +static const struct snd_kcontrol_new skylake_controls[] = { +SOC_DAPM_PIN_SWITCH ("Headphone Jack" ), +SOC_DAPM_PIN_SWITCH ("Headset Mic" ), +SOC_DAPM_PIN_SWITCH ("Spk" ), +}; + +static const struct snd_soc_dapm_widget skylake_widgets[] = { +SND_SOC_DAPM_HP ("Headphone Jack" ,NULL ), +SND_SOC_DAPM_MIC ("Headset Mic" ,NULL ), +SND_SOC_DAPM_SPK ("Spk" ,NULL ), +SND_SOC_DAPM_MIC ("SoC DMIC" ,NULL ), +SND_SOC_DAPM_SINK ("WoV Sink" ), +SND_SOC_DAPM_SPK ("DP" ,NULL ), +SND_SOC_DAPM_SPK ("HDMI" ,NULL ), +SND_SOC_DAPM_SUPPLY ("Platform Clock" ,SND_SOC_NOPM ,0 ,0 , + platform_clock_control,SND_SOC_DAPM_PRE_PMU | +SND_SOC_DAPM_POST_PMD ), }; + +static const struct snd_soc_dapm_route skylake_map[] = { +/* HP jack connectors - unknown if we have jack detection */ + {"Headphone Jack" ,NULL ,"HPOL" }, + {"Headphone Jack" ,NULL ,"HPOR" }, + +/* speaker */ + {"Spk" ,NULL ,"Speaker" }, + +/* other jacks */ + {"MIC" ,NULL ,"Headset Mic" }, + {"DMic" ,NULL ,"SoC DMIC" }, + + {"WoV Sink" ,NULL ,"hwd_in sink" }, + {"HDMI" ,NULL ,"hif5 Output" }, + {"DP" ,NULL ,"hif6 Output" }, + +/* CODEC BE connections */ + {"HiFi Playback" ,NULL ,"ssp0 Tx" }, + {"ssp0 Tx" ,NULL ,"codec0_out" }, + + {"Playback" ,NULL ,"ssp1 Tx" }, + {"ssp1 Tx" ,NULL ,"codec1_out" }, + + {"codec0_in" ,NULL ,"ssp1 Rx" }, + {"ssp1 Rx" ,NULL ,"Capture" }, + +/* DMIC */ + {"dmic01_hifi" ,NULL ,"DMIC01 Rx" }, + {"DMIC01 Rx" ,NULL ,"DMIC AIF" }, + {"hifi1" ,NULL ,"iDisp Tx" }, + {"iDisp Tx" ,NULL ,"iDisp_out" }, + {"Headphone Jack" ,NULL ,"Platform Clock" }, + {"Headset Mic" ,NULL ,"Platform Clock" }, }; + +static int skylake_ssp_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 ADSP will covert the FE rate to 48k, stereo */ + rate->min = rate->max =48000 ; + channels->min = channels->max =2 ; + +/* set SSP0 to 24 bit */ +snd_mask_none (fmt); +snd_mask_set (fmt,SNDRV_PCM_FORMAT_S24_LE ); + +return 0 ; +} + +static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtimesound/soc/intel/boards/skl_nau88l25_max98357a.c
Quoted 10 lines
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +10
-0+*rtd) { +int ret; +struct snd_soc_codec *codec = rtd->codec; + +/* +* Headset buttons map to the google Reference headset. +* These can be configured by userspace. +*/ + ret =snd_soc_card_jack_new (&skylake_audio_card,"Headset Jack" , + SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1|
Quoted 47 lines
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +47
-0+SND_JACK_BTN_2 |SND_JACK_BTN_3 , &skylake_headset, + NULL, 0); +if (ret) { +dev_err (rtd->dev,"Headset Jack creation failed %d\n" , ret); +return ret; + } + +nau8825_enable_jack_detect (codec, &skylake_headset); + +snd_soc_dapm_ignore_suspend (&rtd->card->dapm,"SoC DMIC" ); +snd_soc_dapm_ignore_suspend (&rtd->card->dapm,"WoV Sink" ); + +return ret; +} + +static int skylake_nau8825_fe_init (struct snd_soc_pcm_runtime *rtd) { +struct snd_soc_dapm_context *dapm; +struct snd_soc_component *component = rtd->cpu_dai->component; + + dapm =snd_soc_component_get_dapm (component); +snd_soc_dapm_ignore_suspend (dapm,"Reference Capture" ); + +return 0 ; +} + +static unsigned int rates[] = { +48000 , +}; + +static struct snd_pcm_hw_constraint_list constraints_rates = { + .count =ARRAY_SIZE (rates), + .list = rates, + .mask =0 , +}; + +static unsigned int channels[] = { +2 , +}; + +static struct snd_pcm_hw_constraint_list constraints_channels = { + .count =ARRAY_SIZE (channels), + .list = channels, + .mask =0 , +}; + +static int skl_fe_startup (struct snd_pcm_substream *substream) { +struct snd_pcm_runtime *runtime = substream->runtime;sound/soc/intel/boards/skl_nau88l25_max98357a.c line 228
Quoted 10 lines
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +10
-0+ +/* +* On this platform for PCM device we support, +* 48Khz +* stereo +* 16 bit audio +*/ + + runtime->hw.channels_max =2 ; + snd_pcm_hw_constraint_list(runtime, 0,
SNDRV_PCM_HW_PARAM_CHANNELS,Quoted 7 lines
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +7
-0+ &constraints_channels); + + runtime->hw.formats =SNDRV_PCM_FMTBIT_S16_LE ; +snd_pcm_hw_constraint_msbits (runtime,0 ,16 ,16 ); + + snd_pcm_hw_constraint_list(runtime, 0, + SNDRV_PCM_HW_PARAM_RATE,sound/soc/intel/boards/skl_nau88l25_max98357a.c
Quoted 10 lines
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +10
-0+ &constraints_rates); + +return 0 ; +} + +static const struct snd_soc_ops skylake_nau8825_fe_ops = { + .startup = skl_fe_startup, +}; + +static int skylake_nau8825_hw_params(struct snd_pcm_substream*substream,
Quoted 37 lines
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +37
-0+ 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, +NAU8825_CLK_MCLK ,24000000 ,SND_SOC_CLOCK_IN ); + +if (ret <0 ) +dev_err (rtd->dev,"snd_soc_dai_set_sysclk err = %d\n" , + ret); + +return ret; +} + +static struct snd_soc_ops skylake_nau8825_ops = { + .hw_params = skylake_nau8825_hw_params, }; + +static int skylake_dmic_fixup (struct snd_soc_pcm_runtime *rtd, +struct snd_pcm_hw_params *params) { +struct snd_interval *channels =hw_param_interval (params, +SNDRV_PCM_HW_PARAM_CHANNELS ); + +if (params_channels (params) ==2 ) + channels->min = channels->max =2 ; +else + channels->min = channels->max =4 ; + +return 0 ; +} + +static unsigned int channels_dmic[] = { +2 ,4 , +}; + +static struct snd_pcm_hw_constraint_list constraints_dmic_channels = { + .count =ARRAY_SIZE (channels_dmic),sound/soc/intel/boards/skl_nau88l25_max98357a.c
Quoted 10 lines
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +10
-0+ .list = channels_dmic, + .mask = 0, +}; + +static int skylake_dmic_startup (struct snd_pcm_substream *substream) +{ +struct snd_pcm_runtime *runtime = substream->runtime; + + runtime->hw.channels_max =4 ; + snd_pcm_hw_constraint_list(runtime, 0,
SNDRV_PCM_HW_PARAM_CHANNELS,Quoted 32 lines
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +32
-0+ &constraints_dmic_channels); + +return snd_pcm_hw_constraint_list (substream->runtime,0 , +SNDRV_PCM_HW_PARAM_RATE , &constraints_rates); +} + +static struct snd_soc_ops skylake_dmic_ops = { + .startup = skylake_dmic_startup, }; + +static unsigned int rates_16000[] = { +16000 , +}; + +static struct snd_pcm_hw_constraint_list constraints_16000 = { + .count =ARRAY_SIZE (rates_16000), + .list = rates_16000, +}; + +static int skylake_refcap_startup (struct snd_pcm_substream +*substream) { +return snd_pcm_hw_constraint_list (substream->runtime,0 , +SNDRV_PCM_HW_PARAM_RATE , + &constraints_16000); } + +static struct snd_soc_ops skylaye_refcap_ops = { + .startup = skylake_refcap_startup, }; + +/* skylake digital audio interface glue - connects codec <--> CPU */ +static struct snd_soc_dai_link skylake_dais[] = { +/* Front End DAI links */ + { + .name ="Skl Audio Port" ,sound/soc/intel/boards/skl_nau88l25_max98357a.c
Quoted 10 lines
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +10
-0+ .stream_name = "Audio", + .cpu_dai_name = "System Pin", + .platform_name = "0000:00:1f.3", + .dynamic = 1, + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .nonatomic = 1, + .init = skylake_nau8825_fe_init, + .trigger = { + SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST},Quoted 4 lines
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +4
-0+ .dpcm_playback = 1, + .ops = &skylake_nau8825_fe_ops, + }, + {sound/soc/intel/boards/skl_nau88l25_max98357a.c
Quoted 10 lines
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +10
-0+ .name = "Skl Audio Capture Port", + .stream_name = "Audio Record", + .cpu_dai_name = "System Pin", + .platform_name = "0000:00:1f.3", + .dynamic = 1, + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .nonatomic = 1, + .trigger = { + SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST},Quoted 125 lines
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +125
-0+ .dpcm_capture = 1, + .ops = &skylake_nau8825_fe_ops, + }, + { + .name = "Skl Audio Reference cap", + .stream_name = "Wake on Voice", + .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, + .ops = &skylaye_refcap_ops, + }, + { + .name = "Skl Audio DMIC cap", + .stream_name = "dmiccap", + .cpu_dai_name = "DMIC Pin", + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .platform_name = "0000:00:1f.3", + .init = NULL, + .dpcm_capture = 1, + .nonatomic = 1, + .dynamic = 1, + .ops = &skylake_dmic_ops, + }, + { + .name = "Skl HDMI Port", + .stream_name = "Hdmi", + .cpu_dai_name = "HDMI Pin", + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .platform_name = "0000:00:1f.3", + .dpcm_playback = 1, + .init = NULL, + .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 = "MX98357A:00", + .codec_dai_name = SKL_MAXIM_CODEC_DAI, + .dai_fmt =SND_SOC_DAIFMT_I2S | +SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .ignore_pmdown_time = 1, + .be_hw_params_fixup = skylake_ssp_fixup, + .dpcm_playback = 1, + }, + { +/* SSP1 - Codec */ + .name = "SSP1-Codec", + .be_id = 0, + .cpu_dai_name = "SSP1 Pin", + .platform_name = "0000:00:1f.3", + .no_pcm = 1, + .codec_name = "i2c-10508825:00", + .codec_dai_name = SKL_NUVOTON_CODEC_DAI, + .init = skylake_nau8825_codec_init, + .dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .ignore_pmdown_time = 1, + .be_hw_params_fixup = skylake_ssp_fixup, + .ops = &skylake_nau8825_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", + .be_hw_params_fixup = skylake_dmic_fixup, + .ignore_suspend = 1, + .dpcm_capture = 1, + .no_pcm = 1, + }, + { + .name = "iDisp", + .be_id = 3, + .cpu_dai_name = "iDisp Pin", + .codec_name = "ehdaudio0D2", + .codec_dai_name = "intel-hdmi-hifi1", + .platform_name = "0000:00:1f.3", + .dpcm_playback = 1, + .no_pcm = 1, + }, +}; + +/* skylake audio machine driver for SPT + NAU88L25 */ static struct +snd_soc_card skylake_audio_card = { + .name ="sklnau8825max" , + .owner =THIS_MODULE , + .dai_link = skylake_dais, + .num_links =ARRAY_SIZE (skylake_dais), + .controls = skylake_controls, + .num_controls =ARRAY_SIZE (skylake_controls), + .dapm_widgets = skylake_widgets, + .num_dapm_widgets =ARRAY_SIZE (skylake_widgets), + .dapm_routes = skylake_map, + .num_dapm_routes =ARRAY_SIZE (skylake_map), + .fully_routed = true, +}; + +static int skylake_audio_probe (struct platform_device *pdev) { + skylake_audio_card.dev = &pdev->dev; + +return devm_snd_soc_register_card (&pdev->dev, +&skylake_audio_card); } + +static struct platform_driver skylake_audio = { + .probe = skylake_audio_probe,sound/soc/intel/boards/skl_nau88l25_max98357a.c
Quoted 10 lines
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +10
-0+ .driver = { + .name = "skl_nau88l25_max98357a_i2s", + .pm = &snd_soc_pm_ops, + }, +}; + +module_platform_driver(skylake_audio) + +/* Module information */ +MODULE_DESCRIPTION("Audio Machine driver-NAU88L25 & MAX98357Ain I2S
sound/soc/intel/boards/skl_nau88l25_max98357a.c line 474
Quoted 1 line
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +1
-0+mode"); MODULE_AUTHOR(" Rohit AinapureQuoted 9 lines
sound/soc/intel/boards/skl_nau88l25_max98357a.c new file +2
-1+MODULE_LICENSE ("GPL v2" ); +MODULE_ALIAS ("platform:skl_nau88l25_max98357a_i2s" ); --1.7.9.5
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
PATCH 4/8 ASoc: Intel: boards: fix dapm map of nau88l25_ssm4567 machine
In reply to [email protected]From: "Fang, Yang A" <[email protected]>
The DAPM map for DMIC and SSP was not properly done, so fix that up. Also mark machine as fully routed
--- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +5 -4
@@ -108,22 +108,22 @@ static const struct snd_soc_dapm_route skylake_map[] = {/* other jacks */ {"MIC", NULL, "Headset Mic"}, - {"DMIC AIF", NULL, "SoC DMIC"}, + {"DMic", NULL, "SoC DMIC"},/* CODEC BE connections */ { "Left Playback", NULL, "ssp0 Tx"}, { "Right Playback", NULL, "ssp0 Tx"}, { "ssp0 Tx", NULL, "codec0_out"}, - { "AIF1 Playback", NULL, "ssp1 Tx"}, + { "Playback", NULL, "ssp1 Tx"}, { "ssp1 Tx", NULL, "codec1_out"}, { "codec0_in", NULL, "ssp1 Rx" }, - { "ssp1 Rx", NULL, "AIF1 Capture" }, + { "ssp1 Rx", NULL, "Capture" },/* DMIC */ { "dmic01_hifi", NULL, "DMIC01 Rx" }, - { "DMIC01 Rx", NULL, "Capture" }, + { "DMIC01 Rx", NULL, "DMIC AIF" }, { "Headphone Jack", NULL, "Platform Clock" }, { "Headset Mic", NULL, "Platform Clock" }, };
@@ -336,6 +336,7 @@ static struct snd_soc_card skylake_audio_card = { .num_dapm_routes = ARRAY_SIZE(skylake_map), .codec_conf = ssm4567_codec_conf, .num_configs = ARRAY_SIZE(ssm4567_codec_conf), + .fully_routed = true, };static int skylake_audio_probe (struct platform_device *pdev)
Signature · 1 line
1.7.9.5
Mark Brown
maintainerApplied "ASoc: Intel: boards: fix dapm map of nau88l25_ssm4567 machine" to the asoc tree
The patch
ASoc: Intel: boards: fix dapm map of nau88l25_ssm4567 machine
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
4c6ebc3ecdba9484de5249de406d6fcf725cda62Mon Sep 17 00:00:00 2001
From: "Fang, Yang A" <[email protected]>
Date: Fri, 11 Dec 2015 11:29:09 -0800
Subject: [PATCH] ASoc: Intel: boards: fix dapm map of nau88l25_ssm4567 machine
The DAPM map for DMIC and SSP was not properly done, so fix that up. Also mark machine as fully routed
--- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +5 -4
@@ -108,22 +108,22 @@ static const struct snd_soc_dapm_route skylake_map[] = {/* other jacks */ {"MIC", NULL, "Headset Mic"}, - {"DMIC AIF", NULL, "SoC DMIC"}, + {"DMic", NULL, "SoC DMIC"},/* CODEC BE connections */ { "Left Playback", NULL, "ssp0 Tx"}, { "Right Playback", NULL, "ssp0 Tx"}, { "ssp0 Tx", NULL, "codec0_out"}, - { "AIF1 Playback", NULL, "ssp1 Tx"}, + { "Playback", NULL, "ssp1 Tx"}, { "ssp1 Tx", NULL, "codec1_out"}, { "codec0_in", NULL, "ssp1 Rx" }, - { "ssp1 Rx", NULL, "AIF1 Capture" }, + { "ssp1 Rx", NULL, "Capture" },/* DMIC */ { "dmic01_hifi", NULL, "DMIC01 Rx" }, - { "DMIC01 Rx", NULL, "Capture" }, + { "DMIC01 Rx", NULL, "DMIC AIF" }, { "Headphone Jack", NULL, "Platform Clock" }, { "Headset Mic", NULL, "Platform Clock" }, };
@@ -336,6 +336,7 @@ static struct snd_soc_card skylake_audio_card = { .num_dapm_routes = ARRAY_SIZE(skylake_map), .codec_conf = ssm4567_codec_conf, .num_configs = ARRAY_SIZE(ssm4567_codec_conf), + .fully_routed = true, };static int skylake_audio_probe (struct platform_device *pdev)
Signature · 1 line
2.6.2
PATCH 5/8 ASoc: Intel: boards: update ignore suspend for nau88l25_ssm4567 machine
In reply to [email protected]From: Yong Zhi <[email protected]>
We don't support ignore suspend on few devices so remove that. Also since we support ignore susend on PDM DMIC, add that
--- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +2 -2
@@ -187,6 +187,8 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd)nau8825_enable_jack_detect (codec, &skylake_headset); +snd_soc_dapm_ignore_suspend (&rtd->card->dapm,"SoC DMIC" ); +return ret; }
@@ -285,7 +287,6 @@ static struct snd_soc_dai_link skylake_dais[] = {SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBS_CFS, .init = skylake_ssm4567_codec_init, - .ignore_suspend = 1, .ignore_pmdown_time = 1, .be_hw_params_fixup = skylake_ssp_fixup, .dpcm_playback = 1,
@@ -302,7 +303,6 @@ static struct snd_soc_dai_link skylake_dais[] = { .init = skylake_nau8825_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_ssp_fixup, .ops = &skylake_nau8825_ops,
Signature · 1 line
1.7.9.5
Mark Brown
maintainerApplied "ASoc: Intel: boards: update ignore suspend for nau88l25_ssm4567 machine" to the asoc tree
The patch
ASoc: Intel: boards: update ignore suspend for nau88l25_ssm4567 machine
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
941eee74563652f6cc363d8d62b3a9f4bfffdbe2Mon Sep 17 00:00:00 2001
From: Yong Zhi <[email protected]>
Date: Fri, 11 Dec 2015 11:29:10 -0800
Subject: [PATCH] ASoc: Intel: boards: update ignore suspend for
nau88l25_ssm4567 machine
We don't support ignore suspend on few devices so remove that. Also since we support ignore susend on PDM DMIC, add that
--- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +2 -2
@@ -187,6 +187,8 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd)nau8825_enable_jack_detect (codec, &skylake_headset); +snd_soc_dapm_ignore_suspend (&rtd->card->dapm,"SoC DMIC" ); +return ret; }
@@ -285,7 +287,6 @@ static struct snd_soc_dai_link skylake_dais[] = {SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBS_CFS, .init = skylake_ssm4567_codec_init, - .ignore_suspend = 1, .ignore_pmdown_time = 1, .be_hw_params_fixup = skylake_ssp_fixup, .dpcm_playback = 1,
@@ -302,7 +303,6 @@ static struct snd_soc_dai_link skylake_dais[] = { .init = skylake_nau8825_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_ssp_fixup, .ops = &skylake_nau8825_ops,
Signature · 1 line
2.6.2
PATCH 6/8 ASoc: Intel: boards: update constraints for nau88l25_ssm4567 machine
In reply to [email protected]From: Yong Zhi <[email protected]>
We have specific constraints for FE device (48KHz, stereo, 16 bits) and fixups for BE DMIC links (2 or 4 ch), so add those.
Also add one more FE DAIlink for dmiccap
--- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 136 +++++++++++++++++++++++++ 1 file changed, 136 insertions(+)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +136 -0
@@ -192,6 +192,65 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd)return ret; } +static int skylake_nau8825_fe_init (struct snd_soc_pcm_runtime *rtd) +{ +struct snd_soc_dapm_context *dapm; +struct snd_soc_component *component = rtd->cpu_dai->component; + + dapm =snd_soc_component_get_dapm (component); +snd_soc_dapm_ignore_suspend (dapm,"Reference Capture" ); + +return 0 ; +} + +static unsigned int rates[] = { +48000 , +}; + +static struct snd_pcm_hw_constraint_list constraints_rates = { + .count =ARRAY_SIZE (rates), + .list = rates, + .mask =0 , +}; + +static unsigned int channels[] = { +2 , +}; + +static struct snd_pcm_hw_constraint_list constraints_channels = { + .count =ARRAY_SIZE (channels), + .list = channels, + .mask =0 , +}; + +static int skl_fe_startup (struct snd_pcm_substream *substream) +{ +struct snd_pcm_runtime *runtime = substream->runtime; + +/* +* on this platform for PCM device we support, +* 48Khz +* stereo +* 16 bit audio +*/ + + runtime->hw.channels_max =2 ; +snd_pcm_hw_constraint_list (runtime,0 ,SNDRV_PCM_HW_PARAM_CHANNELS , + &constraints_channels); + + runtime->hw.formats =SNDRV_PCM_FMTBIT_S16_LE ; +snd_pcm_hw_constraint_msbits (runtime,0 ,16 ,16 ); + +snd_pcm_hw_constraint_list (runtime,0 , +SNDRV_PCM_HW_PARAM_RATE , &constraints_rates); + +return 0 ; +} + +static const struct snd_soc_ops skylake_nau8825_fe_ops = { + .startup = skl_fe_startup, +}; +static int skylake_ssp_fixup (struct snd_soc_pcm_runtime *rtd,struct snd_pcm_hw_params *params) {
@@ -211,6 +270,19 @@ static int skylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,return 0 ; } +static int skylake_dmic_fixup (struct snd_soc_pcm_runtime *rtd, +struct snd_pcm_hw_params *params) +{ +struct snd_interval *channels =hw_param_interval (params, +SNDRV_PCM_HW_PARAM_CHANNELS ); +if (params_channels (params) ==2 ) + channels->min = channels->max =2 ; +else + channels->min = channels->max =4 ; + +return 0 ; +} +static int skylake_nau8825_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params) {
@@ -231,6 +303,52 @@ static struct snd_soc_ops skylake_nau8825_ops = { .hw_params = skylake_nau8825_hw_params, }; +static unsigned int channels_dmic[] = { +2 ,4 , +}; + +static struct snd_pcm_hw_constraint_list constraints_dmic_channels = { + .count =ARRAY_SIZE (channels_dmic), + .list = channels_dmic, + .mask =0 , +}; + +static int skylake_dmic_startup (struct snd_pcm_substream *substream) +{ +struct snd_pcm_runtime *runtime = substream->runtime; + + runtime->hw.channels_max =4 ; +snd_pcm_hw_constraint_list (runtime,0 ,SNDRV_PCM_HW_PARAM_CHANNELS , + &constraints_dmic_channels); + +return snd_pcm_hw_constraint_list (substream->runtime,0 , +SNDRV_PCM_HW_PARAM_RATE , &constraints_rates); +} + +static struct snd_soc_ops skylake_dmic_ops = { + .startup = skylake_dmic_startup, +}; + +static unsigned int rates_16000[] = { +16000 , +}; + +static struct snd_pcm_hw_constraint_list constraints_16000 = { + .count =ARRAY_SIZE (rates_16000), + .list = rates_16000, +}; + +static int skylake_refcap_startup (struct snd_pcm_substream *substream) +{ +return snd_pcm_hw_constraint_list (substream->runtime,0 , +SNDRV_PCM_HW_PARAM_RATE , + &constraints_16000); +} + +static struct snd_soc_ops skylaye_refcap_ops = { + .startup = skylake_refcap_startup, +}; +/* skylake digital audio interface glue - connects codec <--> CPU */ static struct snd_soc_dai_link skylake_dais[] = {/* Front End DAI links */
@@ -243,9 +361,11 @@ static struct snd_soc_dai_link skylake_dais[] = { .codec_name = "snd-soc-dummy", .codec_dai_name = "snd-soc-dummy-dai", .nonatomic = 1, + .init = skylake_nau8825_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dpcm_playback = 1, + .ops = &skylake_nau8825_fe_ops, }, { .name = "Skl Audio Capture Port",
@@ -259,6 +379,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dpcm_capture = 1, + .ops = &skylake_nau8825_fe_ops, }, { .name = "Skl Audio Reference cap",
@@ -272,6 +393,20 @@ static struct snd_soc_dai_link skylake_dais[] = { .ignore_suspend = 1, .nonatomic = 1, .dynamic = 1, + .ops = &skylaye_refcap_ops, + }, + { + .name = "Skl Audio DMIC cap", + .stream_name = "dmiccap", + .cpu_dai_name = "DMIC Pin", + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .platform_name = "0000:00:1f.3", + .init = NULL, + .dpcm_capture = 1, + .nonatomic = 1, + .dynamic = 1, + .ops = &skylake_dmic_ops, }, /* Back End DAI links */ {
@@ -317,6 +452,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .codec_dai_name = "dmic-hifi", .platform_name = "0000:00:1f.3", .ignore_suspend = 1, + .be_hw_params_fixup = skylake_dmic_fixup, .dpcm_capture = 1, .no_pcm = 1, },
Signature · 1 line
1.7.9.5
Mark Brown
maintainerApplied "ASoc: Intel: boards: update constraints for nau88l25_ssm4567 machine" to the asoc tree
The patch
ASoc: Intel: boards: update constraints for nau88l25_ssm4567 machine
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
2616e27efb21f82e666312cbbab53e6600225ef1Mon Sep 17 00:00:00 2001
From: Yong Zhi <[email protected]>
Date: Fri, 11 Dec 2015 11:29:11 -0800
Subject: [PATCH] ASoc: Intel: boards: update constraints for nau88l25_ssm4567
machine
We have specific constraints for FE device (48KHz, stereo, 16 bits) and fixups for BE DMIC links (2 or 4 ch), so add those.
Also add one more FE DAIlink for dmiccap
--- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 136 ++++++++++++++++++++++++++ 1 file changed, 136 insertions(+)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +136 -0
@@ -192,6 +192,65 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd)return ret; } +static int skylake_nau8825_fe_init (struct snd_soc_pcm_runtime *rtd) +{ +struct snd_soc_dapm_context *dapm; +struct snd_soc_component *component = rtd->cpu_dai->component; + + dapm =snd_soc_component_get_dapm (component); +snd_soc_dapm_ignore_suspend (dapm,"Reference Capture" ); + +return 0 ; +} + +static unsigned int rates[] = { +48000 , +}; + +static struct snd_pcm_hw_constraint_list constraints_rates = { + .count =ARRAY_SIZE (rates), + .list = rates, + .mask =0 , +}; + +static unsigned int channels[] = { +2 , +}; + +static struct snd_pcm_hw_constraint_list constraints_channels = { + .count =ARRAY_SIZE (channels), + .list = channels, + .mask =0 , +}; + +static int skl_fe_startup (struct snd_pcm_substream *substream) +{ +struct snd_pcm_runtime *runtime = substream->runtime; + +/* +* on this platform for PCM device we support, +* 48Khz +* stereo +* 16 bit audio +*/ + + runtime->hw.channels_max =2 ; +snd_pcm_hw_constraint_list (runtime,0 ,SNDRV_PCM_HW_PARAM_CHANNELS , + &constraints_channels); + + runtime->hw.formats =SNDRV_PCM_FMTBIT_S16_LE ; +snd_pcm_hw_constraint_msbits (runtime,0 ,16 ,16 ); + +snd_pcm_hw_constraint_list (runtime,0 , +SNDRV_PCM_HW_PARAM_RATE , &constraints_rates); + +return 0 ; +} + +static const struct snd_soc_ops skylake_nau8825_fe_ops = { + .startup = skl_fe_startup, +}; +static int skylake_ssp_fixup (struct snd_soc_pcm_runtime *rtd,struct snd_pcm_hw_params *params) {
@@ -211,6 +270,19 @@ static int skylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,return 0 ; } +static int skylake_dmic_fixup (struct snd_soc_pcm_runtime *rtd, +struct snd_pcm_hw_params *params) +{ +struct snd_interval *channels =hw_param_interval (params, +SNDRV_PCM_HW_PARAM_CHANNELS ); +if (params_channels (params) ==2 ) + channels->min = channels->max =2 ; +else + channels->min = channels->max =4 ; + +return 0 ; +} +static int skylake_nau8825_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params) {
@@ -231,6 +303,52 @@ static struct snd_soc_ops skylake_nau8825_ops = { .hw_params = skylake_nau8825_hw_params, }; +static unsigned int channels_dmic[] = { +2 ,4 , +}; + +static struct snd_pcm_hw_constraint_list constraints_dmic_channels = { + .count =ARRAY_SIZE (channels_dmic), + .list = channels_dmic, + .mask =0 , +}; + +static int skylake_dmic_startup (struct snd_pcm_substream *substream) +{ +struct snd_pcm_runtime *runtime = substream->runtime; + + runtime->hw.channels_max =4 ; +snd_pcm_hw_constraint_list (runtime,0 ,SNDRV_PCM_HW_PARAM_CHANNELS , + &constraints_dmic_channels); + +return snd_pcm_hw_constraint_list (substream->runtime,0 , +SNDRV_PCM_HW_PARAM_RATE , &constraints_rates); +} + +static struct snd_soc_ops skylake_dmic_ops = { + .startup = skylake_dmic_startup, +}; + +static unsigned int rates_16000[] = { +16000 , +}; + +static struct snd_pcm_hw_constraint_list constraints_16000 = { + .count =ARRAY_SIZE (rates_16000), + .list = rates_16000, +}; + +static int skylake_refcap_startup (struct snd_pcm_substream *substream) +{ +return snd_pcm_hw_constraint_list (substream->runtime,0 , +SNDRV_PCM_HW_PARAM_RATE , + &constraints_16000); +} + +static struct snd_soc_ops skylaye_refcap_ops = { + .startup = skylake_refcap_startup, +}; +/* skylake digital audio interface glue - connects codec <--> CPU */ static struct snd_soc_dai_link skylake_dais[] = {/* Front End DAI links */
@@ -243,9 +361,11 @@ static struct snd_soc_dai_link skylake_dais[] = { .codec_name = "snd-soc-dummy", .codec_dai_name = "snd-soc-dummy-dai", .nonatomic = 1, + .init = skylake_nau8825_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dpcm_playback = 1, + .ops = &skylake_nau8825_fe_ops, }, { .name = "Skl Audio Capture Port",
@@ -259,6 +379,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dpcm_capture = 1, + .ops = &skylake_nau8825_fe_ops, }, { .name = "Skl Audio Reference cap",
@@ -272,6 +393,20 @@ static struct snd_soc_dai_link skylake_dais[] = { .ignore_suspend = 1, .nonatomic = 1, .dynamic = 1, + .ops = &skylaye_refcap_ops, + }, + { + .name = "Skl Audio DMIC cap", + .stream_name = "dmiccap", + .cpu_dai_name = "DMIC Pin", + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .platform_name = "0000:00:1f.3", + .init = NULL, + .dpcm_capture = 1, + .nonatomic = 1, + .dynamic = 1, + .ops = &skylake_dmic_ops, }, /* Back End DAI links */ {
@@ -317,6 +452,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .codec_dai_name = "dmic-hifi", .platform_name = "0000:00:1f.3", .ignore_suspend = 1, + .be_hw_params_fixup = skylake_dmic_fixup, .dpcm_capture = 1, .no_pcm = 1, },
Signature · 1 line
2.6.2
PATCH 7/8 ASoc: Intel: boards: Add WOV as sink for nau88l25_ssm4567 machine
In reply to [email protected]From: Sathyanarayana Nujella <[email protected]>
We have WOV module which should act as DAPM sink, so add that and its links.
Also rename the refcap to "Wake On Voice" as some user expect to find this name
--- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +4 -1
@@ -92,6 +92,7 @@ static const struct snd_soc_dapm_widget skylake_widgets[] = {SND_SOC_DAPM_SPK ("Left Speaker" ,NULL ),SND_SOC_DAPM_SPK ("Right Speaker" ,NULL ),SND_SOC_DAPM_MIC ("SoC DMIC" ,NULL ), +SND_SOC_DAPM_SINK ("WoV Sink" ),SND_SOC_DAPM_SUPPLY ("Platform Clock" ,SND_SOC_NOPM ,0 ,0 , platform_clock_control,SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
@@ -110,6 +111,7 @@ static const struct snd_soc_dapm_route skylake_map[] = { {"MIC", NULL, "Headset Mic"}, {"DMic", NULL, "SoC DMIC"}, + {"WoV Sink", NULL, "hwd_in sink"},/* CODEC BE connections */ { "Left Playback", NULL, "ssp0 Tx"}, { "Right Playback", NULL, "ssp0 Tx"},
@@ -188,6 +190,7 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd)nau8825_enable_jack_detect (codec, &skylake_headset);snd_soc_dapm_ignore_suspend (&rtd->card->dapm,"SoC DMIC" ); +snd_soc_dapm_ignore_suspend (&rtd->card->dapm,"WoV Sink" );return ret; }
@@ -383,7 +386,7 @@ static struct snd_soc_dai_link skylake_dais[] = { }, { .name = "Skl Audio Reference cap", - .stream_name = "refcap", + .stream_name = "Wake on Voice", .cpu_dai_name = "Reference Pin", .codec_name = "snd-soc-dummy", .codec_dai_name = "snd-soc-dummy-dai",
Signature · 1 line
1.7.9.5
Mark Brown
maintainerApplied "ASoc: Intel: boards: Add WOV as sink for nau88l25_ssm4567 machine" to the asoc tree
The patch
ASoc: Intel: boards: Add WOV as sink for nau88l25_ssm4567 machine
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
2154be362c9050b9ed5d3beac491f0103505bf16Mon Sep 17 00:00:00 2001
From: Sathyanarayana Nujella <[email protected]>
Date: Fri, 11 Dec 2015 11:29:12 -0800
Subject: [PATCH] ASoc: Intel: boards: Add WOV as sink for nau88l25_ssm4567
machine
We have WOV module which should act as DAPM sink, so add that and its links.
Also rename the refcap to "Wake On Voice" as some user expect to find this name
--- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +4 -1
@@ -92,6 +92,7 @@ static const struct snd_soc_dapm_widget skylake_widgets[] = {SND_SOC_DAPM_SPK ("Left Speaker" ,NULL ),SND_SOC_DAPM_SPK ("Right Speaker" ,NULL ),SND_SOC_DAPM_MIC ("SoC DMIC" ,NULL ), +SND_SOC_DAPM_SINK ("WoV Sink" ),SND_SOC_DAPM_SUPPLY ("Platform Clock" ,SND_SOC_NOPM ,0 ,0 , platform_clock_control,SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
@@ -110,6 +111,7 @@ static const struct snd_soc_dapm_route skylake_map[] = { {"MIC", NULL, "Headset Mic"}, {"DMic", NULL, "SoC DMIC"}, + {"WoV Sink", NULL, "hwd_in sink"},/* CODEC BE connections */ { "Left Playback", NULL, "ssp0 Tx"}, { "Right Playback", NULL, "ssp0 Tx"},
@@ -188,6 +190,7 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd)nau8825_enable_jack_detect (codec, &skylake_headset);snd_soc_dapm_ignore_suspend (&rtd->card->dapm,"SoC DMIC" ); +snd_soc_dapm_ignore_suspend (&rtd->card->dapm,"WoV Sink" );return ret; }
@@ -383,7 +386,7 @@ static struct snd_soc_dai_link skylake_dais[] = { }, { .name = "Skl Audio Reference cap", - .stream_name = "refcap", + .stream_name = "Wake on Voice", .cpu_dai_name = "Reference Pin", .codec_name = "snd-soc-dummy", .codec_dai_name = "snd-soc-dummy-dai",
Signature · 1 line
2.6.2
PATCH 8/8 ASoc: Intel: boards: Add HDMI/DP links for nau88l25_ssm4567 machine
In reply to [email protected]From: "Fang, Yang A" <[email protected]>
This machine supports HDMI/DP ports so add these ports and its FE and BE DAIlinks
--- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 30 +++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +30 -0
@@ -93,6 +93,8 @@ static const struct snd_soc_dapm_widget skylake_widgets[] = {SND_SOC_DAPM_SPK ("Right Speaker" ,NULL ),SND_SOC_DAPM_MIC ("SoC DMIC" ,NULL ),SND_SOC_DAPM_SINK ("WoV Sink" ), +SND_SOC_DAPM_SPK ("DP" ,NULL ), +SND_SOC_DAPM_SPK ("HDMI" ,NULL ),SND_SOC_DAPM_SUPPLY ("Platform Clock" ,SND_SOC_NOPM ,0 ,0 , platform_clock_control,SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
@@ -112,6 +114,9 @@ static const struct snd_soc_dapm_route skylake_map[] = { {"DMic", NULL, "SoC DMIC"}, {"WoV Sink", NULL, "hwd_in sink"}, + + {"HDMI", NULL, "hif5 Output"}, + {"DP", NULL, "hif6 Output"},/* CODEC BE connections */ { "Left Playback", NULL, "ssp0 Tx"}, { "Right Playback", NULL, "ssp0 Tx"},
@@ -126,6 +131,8 @@ static const struct snd_soc_dapm_route skylake_map[] = {/* DMIC */ { "dmic01_hifi", NULL, "DMIC01 Rx" }, { "DMIC01 Rx", NULL, "DMIC AIF" }, + { "hifi1", NULL, "iDisp Tx"}, + { "iDisp Tx", NULL, "iDisp_out"}, { "Headphone Jack", NULL, "Platform Clock" }, { "Headset Mic", NULL, "Platform Clock" }, };
@@ -411,6 +418,19 @@ static struct snd_soc_dai_link skylake_dais[] = { .dynamic = 1, .ops = &skylake_dmic_ops, }, + { + .name = "Skl HDMI Port", + .stream_name = "Hdmi", + .cpu_dai_name = "HDMI Pin", + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .platform_name = "0000:00:1f.3", + .dpcm_playback = 1, + .init = NULL, + .nonatomic = 1, + .dynamic = 1, + }, +/* Back End DAI links */ {/* SSP0 - Codec */
@@ -459,6 +479,16 @@ static struct snd_soc_dai_link skylake_dais[] = { .dpcm_capture = 1, .no_pcm = 1, }, + { + .name = "iDisp", + .be_id = 3, + .cpu_dai_name = "iDisp Pin", + .codec_name = "ehdaudio0D2", + .codec_dai_name = "intel-hdmi-hifi1", + .platform_name = "0000:00:1f.3", + .dpcm_playback = 1, + .no_pcm = 1, + }, };/* skylake audio machine driver for SPT + NAU88L25 */
Signature · 1 line
1.7.9.5
Mark Brown
maintainerApplied "ASoc: Intel: boards: Add HDMI/DP links for nau88l25_ssm4567 machine" to the asoc tree
The patch
ASoc: Intel: boards: Add HDMI/DP links for nau88l25_ssm4567 machine
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
743ad80e5c8565ab54e8832f6d74cb543a0adbbaMon Sep 17 00:00:00 2001
From: "Fang, Yang A" <[email protected]>
Date: Fri, 11 Dec 2015 11:29:13 -0800
Subject: [PATCH] ASoc: Intel: boards: Add HDMI/DP links for nau88l25_ssm4567
machine
This machine supports HDMI/DP ports so add these ports and its FE and BE DAIlinks
--- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +30 -0
@@ -93,6 +93,8 @@ static const struct snd_soc_dapm_widget skylake_widgets[] = {SND_SOC_DAPM_SPK ("Right Speaker" ,NULL ),SND_SOC_DAPM_MIC ("SoC DMIC" ,NULL ),SND_SOC_DAPM_SINK ("WoV Sink" ), +SND_SOC_DAPM_SPK ("DP" ,NULL ), +SND_SOC_DAPM_SPK ("HDMI" ,NULL ),SND_SOC_DAPM_SUPPLY ("Platform Clock" ,SND_SOC_NOPM ,0 ,0 , platform_clock_control,SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
@@ -112,6 +114,9 @@ static const struct snd_soc_dapm_route skylake_map[] = { {"DMic", NULL, "SoC DMIC"}, {"WoV Sink", NULL, "hwd_in sink"}, + + {"HDMI", NULL, "hif5 Output"}, + {"DP", NULL, "hif6 Output"},/* CODEC BE connections */ { "Left Playback", NULL, "ssp0 Tx"}, { "Right Playback", NULL, "ssp0 Tx"},
@@ -126,6 +131,8 @@ static const struct snd_soc_dapm_route skylake_map[] = {/* DMIC */ { "dmic01_hifi", NULL, "DMIC01 Rx" }, { "DMIC01 Rx", NULL, "DMIC AIF" }, + { "hifi1", NULL, "iDisp Tx"}, + { "iDisp Tx", NULL, "iDisp_out"}, { "Headphone Jack", NULL, "Platform Clock" }, { "Headset Mic", NULL, "Platform Clock" }, };
@@ -411,6 +418,19 @@ static struct snd_soc_dai_link skylake_dais[] = { .dynamic = 1, .ops = &skylake_dmic_ops, }, + { + .name = "Skl HDMI Port", + .stream_name = "Hdmi", + .cpu_dai_name = "HDMI Pin", + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .platform_name = "0000:00:1f.3", + .dpcm_playback = 1, + .init = NULL, + .nonatomic = 1, + .dynamic = 1, + }, +/* Back End DAI links */ {/* SSP0 - Codec */
@@ -459,6 +479,16 @@ static struct snd_soc_dai_link skylake_dais[] = { .dpcm_capture = 1, .no_pcm = 1, }, + { + .name = "iDisp", + .be_id = 3, + .cpu_dai_name = "iDisp Pin", + .codec_name = "ehdaudio0D2", + .codec_dai_name = "intel-hdmi-hifi1", + .platform_name = "0000:00:1f.3", + .dpcm_playback = 1, + .no_pcm = 1, + }, };/* skylake audio machine driver for SPT + NAU88L25 */
Signature · 1 line
2.6.2
Mark Brown
maintainerApplied "ASoC: max98357a: Add ACPI ID for Maxim" to the asoc tree
In reply to [email protected]The patch
ASoC: max98357a: Add ACPI ID for Maxim
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
5c27087e4b43e2a5be144afe7250fb2b20bd47c4Mon Sep 17 00:00:00 2001
From: Rohit Ainapure <[email protected]>
Date: Fri, 11 Dec 2015 11:29:06 -0800
Subject: [PATCH] ASoC: max98357a: Add ACPI ID for Maxim
Adding ACPI ID "MX98357A" for the MAXIM 98357A amp.
--- sound/soc/codecs/max98357a.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
sound/soc/codecs/max98357a.c +10 -0
@@ -12,6 +12,7 @@* max98357a.c -- MAX98357A ALSA SoC Codec driver */ +#include <linux/acpi.h> #include <linux/device.h> #include <linux/err.h> #include <linux/gpio.h>
@@ -123,10 +124,19 @@ static const struct of_device_id max98357a_device_id[] = {MODULE_DEVICE_TABLE (of, max98357a_device_id);#endif +#ifdef CONFIG_ACPI +static const struct acpi_device_id max98357a_acpi_match[] = { + {"MX98357A" ,0 }, + {}, +}; +MODULE_DEVICE_TABLE (acpi, max98357a_acpi_match); +#endif +static struct platform_driver max98357a_platform_driver = { .driver = { .name ="max98357a" , .of_match_table =of_match_ptr (max98357a_device_id), + .acpi_match_table =ACPI_PTR (max98357a_acpi_match), }, .probe = max98357a_platform_probe, .remove = max98357a_platform_remove,
Signature · 1 line
2.6.2