Baytrail-Cherrytrail updates
Subsystems (3)
v2 cover Baytrail-Cherrytrail updates
As discussed on the alsa-devel mailing list, here is a set of patches to fix
1. previous feedback on bytcht_rt5651 - no new functionality beyond what was already reviewed
2. cosmetic issues (variables in reverse xmas tree order, etc)
3. unnecessary clock tests
4. addition of a helper to remove duplicate code across machine drivers
The last two patches were not included in the first pass, they correct an off-by-one issue which has no functional impact and remove the hard-codec compressed dailinks which don't currently work with the mainline code+publicly available firmware.
Pierre-Louis Bossart (9):
ASoC: Intel: bytcr_rt5651: add MCLK, quirks and cleanups
ASoC: Intel: bytcr_rt5640: cosmetic fixes
ASoC: Intel: cht_bsw_rt5645: cosmetic fixes
ASoC: Intel: bytcht_da7213: cosmetic fixes
ASoC: Intel: bytcht_es8316: remove useless code
ASoC: Add helper to find codec_dai from dai_name
ASoC: Intel: boards: use helper to get codec_dai
ASoC: Intel: boards: fix off-by-one dailink id
ASoC: Intel: boards: remove hard-coded compressed dailinks
include/sound/soc.h | 14 ++ sound/soc/intel/boards/bxt_da7219_max98357a.c | 16 +- sound/soc/intel/boards/bytcht_da7213.c | 17 +- sound/soc/intel/boards/bytcht_es8316.c | 25 +-- sound/soc/intel/boards/bytcht_nocodec.c | 10 +- sound/soc/intel/boards/bytcr_rt5640.c | 105 ++++------- sound/soc/intel/boards/bytcr_rt5651.c | 236 +++++++++++++++++++++--- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 24 +-- sound/soc/intel/boards/cht_bsw_rt5645.c | 103 ++++------- sound/soc/intel/boards/cht_bsw_rt5672.c | 24 +-- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 16 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 16 +- 12 files changed, 318 insertions(+), 288 deletions(-)
Signature · 1 line
2.11.0
PATCH v2 1/9 ASoC: Intel: bytcr_rt5651: add MCLK, quirks and cleanups
Same as for other codecs, enable MCLK by default. When it is not present, e.g. on MinnowBoard B3 since it's not routed on the LSE connector, we fall back to blck-based clocking.
The DMIC quirks are also fixed, there is a single DMIC input of the codec.
reorder variables in reverse x-mas tree as suggested by Andy
--- sound/soc/intel/boards/bytcr_rt5651.c | 239 +++++++++++++++++++++++++++++++--- 1 file changed, 222 insertions(+), 17 deletions(-)
sound/soc/intel/boards/bytcr_rt5651.c +222 -17
@@ -21,24 +21,132 @@#include <linux/module.h> #include <linux/platform_device.h> #include <linux/acpi.h> +#include <linux/clk.h> #include <linux/device.h> #include <linux/dmi.h> #include <linux/slab.h> +#include <asm/platform_sst_audio.h> #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> #include <sound/jack.h> #include "../../codecs/rt5651.h" #include "../atom/sst-atom-controls.h" +#include "../common/sst-acpi.h" + +enum { +BYT_RT5651_DMIC_MAP , +BYT_RT5651_IN1_MAP , +}; + +#define BYT_RT5651_MAP (quirk) ((quirk) & GENMASK(7, 0)) +#define BYT_RT5651_DMIC_EN BIT(16) +#define BYT_RT5651_MCLK_EN BIT(17) +#define BYT_RT5651_MCLK_25MHZ BIT(18) + +struct byt_rt5651_private { +struct clk *mclk; +}; + +static unsigned long byt_rt5651_quirk =BYT_RT5651_DMIC_MAP | +BYT_RT5651_DMIC_EN | +BYT_RT5651_MCLK_EN ; + +static void log_quirks (struct device *dev) +{ +if (BYT_RT5651_MAP (byt_rt5651_quirk) ==BYT_RT5651_DMIC_MAP ) +dev_info (dev,"quirk DMIC_MAP enabled" ); +if (BYT_RT5651_MAP (byt_rt5651_quirk) ==BYT_RT5651_IN1_MAP ) +dev_info (dev,"quirk IN1_MAP enabled" ); +if (byt_rt5651_quirk &BYT_RT5651_DMIC_EN ) +dev_info (dev,"quirk DMIC enabled" ); +if (byt_rt5651_quirk &BYT_RT5651_MCLK_EN ) +dev_info (dev,"quirk MCLK_EN enabled" ); +if (byt_rt5651_quirk &BYT_RT5651_MCLK_25MHZ ) +dev_info (dev,"quirk MCLK_25MHZ enabled" ); +} + +#define BYT_CODEC_DAI1 "rt5651-aif1" + +static inline struct snd_soc_dai *byt_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,BYT_CODEC_DAI1 , +strlen (BYT_CODEC_DAI1 ))) +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; +struct byt_rt5651_private *priv =snd_soc_card_get_drvdata (card); +int ret; + + codec_dai =byt_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)) { +if (byt_rt5651_quirk &BYT_RT5651_MCLK_EN ) { + ret =clk_prepare_enable (priv->mclk); +if (ret <0 ) { +dev_err (card->dev, +"could not configure MCLK state" ); +return ret; + } + } + ret =snd_soc_dai_set_sysclk (codec_dai,RT5651_SCLK_S_PLL1 , +48000 *512 , +SND_SOC_CLOCK_IN ); + }else { +/* +* Set codec clock source to internal clock before +* turning off the platform clock. Codec needs clock +* for Jack detection and button press +*/ + ret =snd_soc_dai_set_sysclk (codec_dai,RT5651_SCLK_S_RCCLK , +48000 *512 , +SND_SOC_CLOCK_IN ); +if (!ret) +if (byt_rt5651_quirk &BYT_RT5651_MCLK_EN ) +clk_disable_unprepare (priv->mclk); + } + +if (ret <0 ) { +dev_err (card->dev,"can't set codec sysclk: %d\n" , ret); +return ret; + } + +return 0 ; +}static const struct snd_soc_dapm_widget byt_rt5651_widgets[] = {SND_SOC_DAPM_HP ("Headphone" ,NULL ),SND_SOC_DAPM_MIC ("Headset Mic" ,NULL ),SND_SOC_DAPM_MIC ("Internal Mic" ,NULL ),SND_SOC_DAPM_SPK ("Speaker" ,NULL ), +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 byt_rt5651_audio_map[] = { + {"Headphone" ,NULL ,"Platform Clock" }, + {"Headset Mic" ,NULL ,"Platform Clock" }, + {"Internal Mic" ,NULL ,"Platform Clock" }, + {"Speaker" ,NULL ,"Platform Clock" }, + {"AIF1 Playback" ,NULL ,"ssp2 Tx" }, {"ssp2 Tx" ,NULL ,"codec_out0" }, {"ssp2 Tx" ,NULL ,"codec_out1" },
@@ -64,18 +172,6 @@ static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_map[] = { {"IN1P", NULL, "Internal Mic"}, }; -enum { -BYT_RT5651_DMIC1_MAP , -BYT_RT5651_DMIC2_MAP , -BYT_RT5651_IN1_MAP , -}; - -#define BYT_RT5651_MAP (quirk) ((quirk) & 0xff) -#define BYT_RT5651_DMIC_EN BIT(16) - -static unsigned long byt_rt5651_quirk =BYT_RT5651_DMIC1_MAP | -BYT_RT5651_DMIC_EN ; -static const struct snd_kcontrol_new byt_rt5651_controls[] = {SOC_DAPM_PIN_SWITCH ("Headphone" ), SOC_DAPM_PIN_SWITCH("Headset Mic"),
@@ -100,9 +196,26 @@ static int byt_rt5651_aif1_hw_params(struct snd_pcm_substream *substream,return ret; } - ret =snd_soc_dai_set_pll (codec_dai,0 ,RT5651_PLL1_S_BCLK1 , -params_rate (params) *50 , -params_rate (params) *512 ); +if (!(byt_rt5651_quirk &BYT_RT5651_MCLK_EN )) { +/* 2x25 bit slots on SSP2 */ + ret =snd_soc_dai_set_pll (codec_dai,0 , +RT5651_PLL1_S_BCLK1 , +params_rate (params) *50 , +params_rate (params) *512 ); + }else { +if (byt_rt5651_quirk &BYT_RT5651_MCLK_25MHZ ) { + ret =snd_soc_dai_set_pll (codec_dai,0 , +RT5651_PLL1_S_MCLK , +25000000 , +params_rate (params) *512 ); + }else { + ret =snd_soc_dai_set_pll (codec_dai,0 , +RT5651_PLL1_S_MCLK , +19200000 , +params_rate (params) *512 ); + } + } +if (ret <0 ) {dev_err (rtd->dev,"can't set codec pll: %d\n" , ret);return ret;
@@ -111,20 +224,35 @@ static int byt_rt5651_aif1_hw_params(struct snd_pcm_substream *substream,return 0 ; } +static int byt_rt5651_quirk_cb (const struct dmi_system_id *id) +{ + byt_rt5651_quirk = (unsigned long )id->driver_data; +return 1 ; +} +static const struct dmi_system_id byt_rt5651_quirk_table[] = { + { + .callback = byt_rt5651_quirk_cb, + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Circuitco" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Minnowboard Max B3 PLATFORM" ), + }, + .driver_data = (void *)(BYT_RT5651_DMIC_MAP | +BYT_RT5651_DMIC_EN ), + }, {} };static int byt_rt5651_init (struct snd_soc_pcm_runtime *runtime) { -int ret;struct snd_soc_card *card = runtime->card; +struct byt_rt5651_private *priv =snd_soc_card_get_drvdata (card);const struct snd_soc_dapm_route *custom_map;int num_routes; +int ret; card->dapm.idle_bias_off = true; -dmi_check_system (byt_rt5651_quirk_table);switch (BYT_RT5651_MAP (byt_rt5651_quirk)) {case BYT_RT5651_IN1_MAP : custom_map = byt_rt5651_intmic_in1_map;
@@ -147,6 +275,30 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)snd_soc_dapm_ignore_suspend (&card->dapm,"Headphone" );snd_soc_dapm_ignore_suspend (&card->dapm,"Speaker" ); +if (byt_rt5651_quirk &BYT_RT5651_MCLK_EN ) { +/* +* The firmware might enable the clock at +* boot (this information may or may not +* be reflected in the enable clock register). +* To change the rate we must disable the clock +* first to cover these cases. Due to common +* clock framework restrictions that do not allow +* to disable a clock that has not been enabled, +* we need to enable the clock first. +*/ + ret =clk_prepare_enable (priv->mclk); +if (!ret) +clk_disable_unprepare (priv->mclk); + +if (byt_rt5651_quirk &BYT_RT5651_MCLK_25MHZ ) + ret =clk_set_rate (priv->mclk,25000000 ); +else + ret =clk_set_rate (priv->mclk,19200000 ); + +if (ret) +dev_err (card->dev,"unable to set MCLK rate\n" ); + } +return ret; }
@@ -292,13 +444,66 @@ static struct snd_soc_card byt_rt5651_card = { .fully_routed = true, }; +static char byt_rt5651_codec_name[16 ];/* i2c-<HID>:00 with HID being 8 chars */ +static int snd_byt_rt5651_mc_probe (struct platform_device *pdev) { +struct byt_rt5651_private *priv; +struct sst_acpi_mach *mach; +const char *i2c_name =NULL ;int ret_val =0 ; +int dai_index; +int i; + + priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_ATOMIC ); +if (!priv) +return -ENOMEM ;/* register the soc card */ byt_rt5651_card.dev = &pdev->dev; + mach = byt_rt5651_card.dev->platform_data; +snd_soc_card_set_drvdata (&byt_rt5651_card, priv); + +/* fix index of codec dai */ + dai_index =MERR_DPCM_COMPR +1 ; +for (i =0 ; i <ARRAY_SIZE (byt_rt5651_dais); i++) { +if (!strcmp (byt_rt5651_dais[i].codec_name,"i2c-10EC5651:00" )) { + dai_index = i; +break ; + } + } + +/* fixup codec name based on HID */ + i2c_name =sst_acpi_find_name_from_hid (mach->id); +if (i2c_name) { +snprintf (byt_rt5651_codec_name,sizeof (byt_rt5651_codec_name), +"%s%s" ,"i2c-" , i2c_name); + + byt_rt5651_dais[dai_index].codec_name = byt_rt5651_codec_name; + } + +/* check quirks before creating card */ +dmi_check_system (byt_rt5651_quirk_table); +log_quirks (&pdev->dev); + +if (byt_rt5651_quirk &BYT_RT5651_MCLK_EN ) { + priv->mclk =devm_clk_get (&pdev->dev,"pmc_plt_clk_3" ); +if (IS_ERR (priv->mclk)) { +dev_err (&pdev->dev, +"Failed to get MCLK from pmc_plt_clk_3: %ld\n" , +PTR_ERR (priv->mclk)); +/* +* Fall back to bit clock usage for -ENOENT (clock not +* available likely due to missing dependencies), bail +* for all other errors, including -EPROBE_DEFER +*/ +if (ret_val != -ENOENT ) +return ret_val; + byt_rt5651_quirk &= ~BYT_RT5651_MCLK_EN ; + } + } + ret_val =devm_snd_soc_register_card (&pdev->dev, &byt_rt5651_card);if (ret_val) {
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: Intel: bytcr_rt5651: add MCLK, quirks and cleanups" to the asoc tree
The patch
ASoC: Intel: bytcr_rt5651: add MCLK, quirks and cleanups
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
02c0a3b3047f8fe49fdc040414ee243f2b2c64ceMon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Thu, 12 Oct 2017 18:37:57 -0500
Subject: [PATCH] ASoC: Intel: bytcr_rt5651: add MCLK, quirks and cleanups
Same as for other codecs, enable MCLK by default. When it is not present, e.g. on MinnowBoard B3 since it's not routed on the LSE connector, we fall back to blck-based clocking.
The DMIC quirks are also fixed, there is a single DMIC input of the codec.
reorder variables in reverse x-mas tree as suggested by Andy
--- sound/soc/intel/boards/bytcr_rt5651.c | 239 +++++++++++++++++++++++++++++++--- 1 file changed, 222 insertions(+), 17 deletions(-)
sound/soc/intel/boards/bytcr_rt5651.c +222 -17
@@ -21,24 +21,132 @@#include <linux/module.h> #include <linux/platform_device.h> #include <linux/acpi.h> +#include <linux/clk.h> #include <linux/device.h> #include <linux/dmi.h> #include <linux/slab.h> +#include <asm/platform_sst_audio.h> #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> #include <sound/jack.h> #include "../../codecs/rt5651.h" #include "../atom/sst-atom-controls.h" +#include "../common/sst-acpi.h" + +enum { +BYT_RT5651_DMIC_MAP , +BYT_RT5651_IN1_MAP , +}; + +#define BYT_RT5651_MAP (quirk) ((quirk) & GENMASK(7, 0)) +#define BYT_RT5651_DMIC_EN BIT(16) +#define BYT_RT5651_MCLK_EN BIT(17) +#define BYT_RT5651_MCLK_25MHZ BIT(18) + +struct byt_rt5651_private { +struct clk *mclk; +}; + +static unsigned long byt_rt5651_quirk =BYT_RT5651_DMIC_MAP | +BYT_RT5651_DMIC_EN | +BYT_RT5651_MCLK_EN ; + +static void log_quirks (struct device *dev) +{ +if (BYT_RT5651_MAP (byt_rt5651_quirk) ==BYT_RT5651_DMIC_MAP ) +dev_info (dev,"quirk DMIC_MAP enabled" ); +if (BYT_RT5651_MAP (byt_rt5651_quirk) ==BYT_RT5651_IN1_MAP ) +dev_info (dev,"quirk IN1_MAP enabled" ); +if (byt_rt5651_quirk &BYT_RT5651_DMIC_EN ) +dev_info (dev,"quirk DMIC enabled" ); +if (byt_rt5651_quirk &BYT_RT5651_MCLK_EN ) +dev_info (dev,"quirk MCLK_EN enabled" ); +if (byt_rt5651_quirk &BYT_RT5651_MCLK_25MHZ ) +dev_info (dev,"quirk MCLK_25MHZ enabled" ); +} + +#define BYT_CODEC_DAI1 "rt5651-aif1" + +static inline struct snd_soc_dai *byt_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,BYT_CODEC_DAI1 , +strlen (BYT_CODEC_DAI1 ))) +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; +struct byt_rt5651_private *priv =snd_soc_card_get_drvdata (card); +int ret; + + codec_dai =byt_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)) { +if (byt_rt5651_quirk &BYT_RT5651_MCLK_EN ) { + ret =clk_prepare_enable (priv->mclk); +if (ret <0 ) { +dev_err (card->dev, +"could not configure MCLK state" ); +return ret; + } + } + ret =snd_soc_dai_set_sysclk (codec_dai,RT5651_SCLK_S_PLL1 , +48000 *512 , +SND_SOC_CLOCK_IN ); + }else { +/* +* Set codec clock source to internal clock before +* turning off the platform clock. Codec needs clock +* for Jack detection and button press +*/ + ret =snd_soc_dai_set_sysclk (codec_dai,RT5651_SCLK_S_RCCLK , +48000 *512 , +SND_SOC_CLOCK_IN ); +if (!ret) +if (byt_rt5651_quirk &BYT_RT5651_MCLK_EN ) +clk_disable_unprepare (priv->mclk); + } + +if (ret <0 ) { +dev_err (card->dev,"can't set codec sysclk: %d\n" , ret); +return ret; + } + +return 0 ; +}static const struct snd_soc_dapm_widget byt_rt5651_widgets[] = {SND_SOC_DAPM_HP ("Headphone" ,NULL ),SND_SOC_DAPM_MIC ("Headset Mic" ,NULL ),SND_SOC_DAPM_MIC ("Internal Mic" ,NULL ),SND_SOC_DAPM_SPK ("Speaker" ,NULL ), +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 byt_rt5651_audio_map[] = { + {"Headphone" ,NULL ,"Platform Clock" }, + {"Headset Mic" ,NULL ,"Platform Clock" }, + {"Internal Mic" ,NULL ,"Platform Clock" }, + {"Speaker" ,NULL ,"Platform Clock" }, + {"AIF1 Playback" ,NULL ,"ssp2 Tx" }, {"ssp2 Tx" ,NULL ,"codec_out0" }, {"ssp2 Tx" ,NULL ,"codec_out1" },
@@ -64,18 +172,6 @@ static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_map[] = { {"IN1P", NULL, "Internal Mic"}, }; -enum { -BYT_RT5651_DMIC1_MAP , -BYT_RT5651_DMIC2_MAP , -BYT_RT5651_IN1_MAP , -}; - -#define BYT_RT5651_MAP (quirk) ((quirk) & 0xff) -#define BYT_RT5651_DMIC_EN BIT(16) - -static unsigned long byt_rt5651_quirk =BYT_RT5651_DMIC1_MAP | -BYT_RT5651_DMIC_EN ; -static const struct snd_kcontrol_new byt_rt5651_controls[] = {SOC_DAPM_PIN_SWITCH ("Headphone" ), SOC_DAPM_PIN_SWITCH("Headset Mic"),
@@ -100,9 +196,26 @@ static int byt_rt5651_aif1_hw_params(struct snd_pcm_substream *substream,return ret; } - ret =snd_soc_dai_set_pll (codec_dai,0 ,RT5651_PLL1_S_BCLK1 , -params_rate (params) *50 , -params_rate (params) *512 ); +if (!(byt_rt5651_quirk &BYT_RT5651_MCLK_EN )) { +/* 2x25 bit slots on SSP2 */ + ret =snd_soc_dai_set_pll (codec_dai,0 , +RT5651_PLL1_S_BCLK1 , +params_rate (params) *50 , +params_rate (params) *512 ); + }else { +if (byt_rt5651_quirk &BYT_RT5651_MCLK_25MHZ ) { + ret =snd_soc_dai_set_pll (codec_dai,0 , +RT5651_PLL1_S_MCLK , +25000000 , +params_rate (params) *512 ); + }else { + ret =snd_soc_dai_set_pll (codec_dai,0 , +RT5651_PLL1_S_MCLK , +19200000 , +params_rate (params) *512 ); + } + } +if (ret <0 ) {dev_err (rtd->dev,"can't set codec pll: %d\n" , ret);return ret;
@@ -111,20 +224,35 @@ static int byt_rt5651_aif1_hw_params(struct snd_pcm_substream *substream,return 0 ; } +static int byt_rt5651_quirk_cb (const struct dmi_system_id *id) +{ + byt_rt5651_quirk = (unsigned long )id->driver_data; +return 1 ; +} +static const struct dmi_system_id byt_rt5651_quirk_table[] = { + { + .callback = byt_rt5651_quirk_cb, + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Circuitco" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Minnowboard Max B3 PLATFORM" ), + }, + .driver_data = (void *)(BYT_RT5651_DMIC_MAP | +BYT_RT5651_DMIC_EN ), + }, {} };static int byt_rt5651_init (struct snd_soc_pcm_runtime *runtime) { -int ret;struct snd_soc_card *card = runtime->card; +struct byt_rt5651_private *priv =snd_soc_card_get_drvdata (card);const struct snd_soc_dapm_route *custom_map;int num_routes; +int ret; card->dapm.idle_bias_off = true; -dmi_check_system (byt_rt5651_quirk_table);switch (BYT_RT5651_MAP (byt_rt5651_quirk)) {case BYT_RT5651_IN1_MAP : custom_map = byt_rt5651_intmic_in1_map;
@@ -147,6 +275,30 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)snd_soc_dapm_ignore_suspend (&card->dapm,"Headphone" );snd_soc_dapm_ignore_suspend (&card->dapm,"Speaker" ); +if (byt_rt5651_quirk &BYT_RT5651_MCLK_EN ) { +/* +* The firmware might enable the clock at +* boot (this information may or may not +* be reflected in the enable clock register). +* To change the rate we must disable the clock +* first to cover these cases. Due to common +* clock framework restrictions that do not allow +* to disable a clock that has not been enabled, +* we need to enable the clock first. +*/ + ret =clk_prepare_enable (priv->mclk); +if (!ret) +clk_disable_unprepare (priv->mclk); + +if (byt_rt5651_quirk &BYT_RT5651_MCLK_25MHZ ) + ret =clk_set_rate (priv->mclk,25000000 ); +else + ret =clk_set_rate (priv->mclk,19200000 ); + +if (ret) +dev_err (card->dev,"unable to set MCLK rate\n" ); + } +return ret; }
@@ -292,13 +444,66 @@ static struct snd_soc_card byt_rt5651_card = { .fully_routed = true, }; +static char byt_rt5651_codec_name[16 ];/* i2c-<HID>:00 with HID being 8 chars */ +static int snd_byt_rt5651_mc_probe (struct platform_device *pdev) { +struct byt_rt5651_private *priv; +struct sst_acpi_mach *mach; +const char *i2c_name =NULL ;int ret_val =0 ; +int dai_index; +int i; + + priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_ATOMIC ); +if (!priv) +return -ENOMEM ;/* register the soc card */ byt_rt5651_card.dev = &pdev->dev; + mach = byt_rt5651_card.dev->platform_data; +snd_soc_card_set_drvdata (&byt_rt5651_card, priv); + +/* fix index of codec dai */ + dai_index =MERR_DPCM_COMPR +1 ; +for (i =0 ; i <ARRAY_SIZE (byt_rt5651_dais); i++) { +if (!strcmp (byt_rt5651_dais[i].codec_name,"i2c-10EC5651:00" )) { + dai_index = i; +break ; + } + } + +/* fixup codec name based on HID */ + i2c_name =sst_acpi_find_name_from_hid (mach->id); +if (i2c_name) { +snprintf (byt_rt5651_codec_name,sizeof (byt_rt5651_codec_name), +"%s%s" ,"i2c-" , i2c_name); + + byt_rt5651_dais[dai_index].codec_name = byt_rt5651_codec_name; + } + +/* check quirks before creating card */ +dmi_check_system (byt_rt5651_quirk_table); +log_quirks (&pdev->dev); + +if (byt_rt5651_quirk &BYT_RT5651_MCLK_EN ) { + priv->mclk =devm_clk_get (&pdev->dev,"pmc_plt_clk_3" ); +if (IS_ERR (priv->mclk)) { +dev_err (&pdev->dev, +"Failed to get MCLK from pmc_plt_clk_3: %ld\n" , +PTR_ERR (priv->mclk)); +/* +* Fall back to bit clock usage for -ENOENT (clock not +* available likely due to missing dependencies), bail +* for all other errors, including -EPROBE_DEFER +*/ +if (ret_val != -ENOENT ) +return ret_val; + byt_rt5651_quirk &= ~BYT_RT5651_MCLK_EN ; + } + } + ret_val =devm_snd_soc_register_card (&pdev->dev, &byt_rt5651_card);if (ret_val) {
Signature · 1 line
2.14.1
PATCH v2 2/9 ASoC: Intel: bytcr_rt5640: cosmetic fixes
In reply to Pierre-Louis BossartReorder variable names, change MCLK test, change quirks No functional change
--- sound/soc/intel/boards/bytcr_rt5640.c | 73 +++++++++++++++++------------------ 1 file changed, 36 insertions(+), 37 deletions(-)
sound/soc/intel/boards/bytcr_rt5640.c +36 -37
@@ -22,12 +22,12 @@#include <linux/moduleparam.h> #include <linux/platform_device.h> #include <linux/acpi.h> +#include <linux/clk.h> #include <linux/device.h> #include <linux/dmi.h> #include <linux/slab.h> #include <asm/cpu_device_id.h> #include <asm/platform_sst_audio.h> -#include <linux/clk.h> #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h>
@@ -44,13 +44,13 @@ enum { BYT_RT5640_IN3_MAP, }; -#define BYT_RT5640_MAP (quirk) ((quirk) & 0xff) +#define BYT_RT5640_MAP (quirk) ((quirk) & GENMASK(7, 0))#define BYT_RT5640_DMIC_EN BIT(16)#define BYT_RT5640_MONO_SPEAKER BIT(17)#define BYT_RT5640_DIFF_MIC BIT(18)/* defaut is single-ended */ -#define BYT_RT5640_SSP2_AIF2 BIT(19)/* default is using AIF1 */ -#define BYT_RT5640_SSP0_AIF1 BIT(20) -#define BYT_RT5640_SSP0_AIF2 BIT(21) +#define BYT_RT5640_SSP2_AIF2 BIT(19)/* default is using AIF1 */ +#define BYT_RT5640_SSP0_AIF1 BIT(20) +#define BYT_RT5640_SSP0_AIF2 BIT(21)#define BYT_RT5640_MCLK_EN BIT(22)#define BYT_RT5640_MCLK_25MHZ BIT(23)
@@ -178,7 +178,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w, }if (SND_SOC_DAPM_EVENT_ON (event)) { -if (priv->mclk) { +if (byt_rt5640_quirk &BYT_RT5640_MCLK_EN ) { ret =clk_prepare_enable (priv->mclk);if (ret <0 ) { dev_err(card->dev,
@@ -199,7 +199,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,48000 *512 , SND_SOC_CLOCK_IN);if (!ret) { -if (priv->mclk) +if (byt_rt5640_quirk &BYT_RT5640_MCLK_EN )clk_disable_unprepare (priv->mclk); } }
@@ -376,8 +376,8 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TA"), }, - .driver_data = (unsigned long *)(BYT_RT5640_IN1_MAP | - BYT_RT5640_MCLK_EN), + .driver_data = (void *)(BYT_RT5640_IN1_MAP | + BYT_RT5640_MCLK_EN), }, { .callback = byt_rt5640_quirk_cb,
@@ -385,12 +385,11 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TAF"), }, - .driver_data = (unsigned long *)(BYT_RT5640_IN1_MAP | -BYT_RT5640_MONO_SPEAKER | -BYT_RT5640_DIFF_MIC | -BYT_RT5640_SSP0_AIF2 | -BYT_RT5640_MCLK_EN - ), + .driver_data = (void *)(BYT_RT5640_IN1_MAP | +BYT_RT5640_MONO_SPEAKER | +BYT_RT5640_DIFF_MIC | +BYT_RT5640_SSP0_AIF2 | + BYT_RT5640_MCLK_EN), }, { .callback = byt_rt5640_quirk_cb,
@@ -398,9 +397,9 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"DellInc." ), DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Venue 8 Pro 5830"), }, - .driver_data = (unsigned long *)(BYT_RT5640_DMIC2_MAP | -BYT_RT5640_DMIC_EN | - BYT_RT5640_MCLK_EN), + .driver_data = (void *)(BYT_RT5640_DMIC2_MAP | +BYT_RT5640_DMIC_EN | + BYT_RT5640_MCLK_EN), }, { .callback = byt_rt5640_quirk_cb,
@@ -408,8 +407,8 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "HP ElitePad 1000 G2"), }, - .driver_data = (unsigned long *)(BYT_RT5640_IN1_MAP | - BYT_RT5640_MCLK_EN), + .driver_data = (void *)(BYT_RT5640_IN1_MAP | + BYT_RT5640_MCLK_EN), }, { .callback = byt_rt5640_quirk_cb,
@@ -417,8 +416,8 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {DMI_MATCH (DMI_SYS_VENDOR ,"Circuitco" ), DMI_MATCH(DMI_PRODUCT_NAME, "Minnowboard Max B3 PLATFORM"), }, - .driver_data = (unsigned long *)(BYT_RT5640_DMIC1_MAP | - BYT_RT5640_DMIC_EN), + .driver_data = (void *)(BYT_RT5640_DMIC1_MAP | + BYT_RT5640_DMIC_EN), }, { .callback = byt_rt5640_quirk_cb,
@@ -426,9 +425,9 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {DMI_MATCH (DMI_BOARD_VENDOR ,"TECLAST" ), DMI_MATCH(DMI_BOARD_NAME, "tPAD"), }, - .driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP | -BYT_RT5640_MCLK_EN | - BYT_RT5640_SSP0_AIF1), + .driver_data = (void *)(BYT_RT5640_IN3_MAP | +BYT_RT5640_MCLK_EN | + BYT_RT5640_SSP0_AIF1), }, { .callback = byt_rt5640_quirk_cb,
@@ -436,7 +435,7 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW5-012"), }, - .driver_data = (unsigned long *)(BYT_RT5640_IN1_MAP | + .driver_data = (void *)(BYT_RT5640_IN1_MAP |BYT_RT5640_MCLK_EN | BYT_RT5640_SSP0_AIF1),
@@ -446,9 +445,9 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Insyde"), }, - .driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP | - BYT_RT5640_MCLK_EN | - BYT_RT5640_SSP0_AIF1), + .driver_data = (void *)(BYT_RT5640_IN3_MAP | + BYT_RT5640_MCLK_EN | + BYT_RT5640_SSP0_AIF1), }, {}
@@ -456,12 +455,12 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {static int byt_rt5640_init (struct snd_soc_pcm_runtime *runtime) { -int ret; -struct snd_soc_codec *codec = runtime->codec;struct snd_soc_card *card = runtime->card; -const struct snd_soc_dapm_route *custom_map;struct byt_rt5640_private *priv =snd_soc_card_get_drvdata (card); +struct snd_soc_codec *codec = runtime->codec; +const struct snd_soc_dapm_route *custom_map;int num_routes; +int ret; card->dapm.idle_bias_off = true;
@@ -549,7 +548,7 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)snd_soc_dapm_ignore_suspend (&card->dapm,"Headphone" );snd_soc_dapm_ignore_suspend (&card->dapm,"Speaker" ); -if (priv->mclk) { +if (byt_rt5640_quirk &BYT_RT5640_MCLK_EN ) {/* * The firmware might enable the clock at * boot (this information may or may not
@@ -758,12 +757,12 @@ struct acpi_chan_package { /* ACPICA seems to require 64 bit integers */static int snd_byt_rt5640_mc_probe (struct platform_device *pdev) { -int ret_val =0 ; +struct byt_rt5640_private *priv;struct sst_acpi_mach *mach;const char *i2c_name =NULL ; -int i; +int ret_val =0 ;int dai_index; -struct byt_rt5640_private *priv; +int i; is_bytcr = false; priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_ATOMIC );
@@ -786,7 +785,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)/* fixup codec name based on HID */ i2c_name =sst_acpi_find_name_from_hid (mach->id); -if (i2c_name !=NULL ) { +if (i2c_name) {snprintf (byt_rt5640_codec_name,sizeof (byt_rt5640_codec_name),"%s%s" ,"i2c-" , i2c_name);
Signature · 1 line
2.11.0
PATCH v2 3/9 ASoC: Intel: cht_bsw_rt5645: cosmetic fixes
In reply to Pierre-Louis BossartReorder variable names, change MCLK test, change quirks No functional change
--- sound/soc/intel/boards/cht_bsw_rt5645.c | 73 ++++++++++++++++----------------- 1 file changed, 35 insertions(+), 38 deletions(-)
sound/soc/intel/boards/cht_bsw_rt5645.c +35 -38
@@ -21,13 +21,13 @@*/ #include <linux/module.h> -#include <linux/acpi.h> #include <linux/platform_device.h> +#include <linux/acpi.h> +#include <linux/clk.h> #include <linux/dmi.h> #include <linux/slab.h> #include <asm/cpu_device_id.h> #include <asm/platform_sst_audio.h> -#include <linux/clk.h> #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h>
@@ -53,7 +53,7 @@ struct cht_mc_private {struct clk *mclk; }; -#define CHT_RT5645_MAP (quirk) ((quirk) & 0xff) +#define CHT_RT5645_MAP (quirk) ((quirk) & GENMASK(7, 0))#define CHT_RT5645_SSP2_AIF2 BIT(16)/* default is using AIF1 */ #define CHT_RT5645_SSP0_AIF1 BIT(17)#define CHT_RT5645_SSP0_AIF2 BIT(18)
@@ -101,13 +101,11 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w, }if (SND_SOC_DAPM_EVENT_ON (event)) { -if (ctx->mclk) { - ret =clk_prepare_enable (ctx->mclk); -if (ret <0 ) { -dev_err (card->dev, -"could not configure MCLK state" ); -return ret; - } + ret =clk_prepare_enable (ctx->mclk); +if (ret <0 ) { +dev_err (card->dev, +"could not configure MCLK state" ); +return ret; } }else {/* Set codec sysclk source to its internal clock because codec PLL will
@@ -122,8 +120,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,return ret; } -if (ctx->mclk) -clk_disable_unprepare (ctx->mclk); +clk_disable_unprepare (ctx->mclk); }return 0 ;
@@ -258,11 +255,11 @@ static const struct dmi_system_id cht_rt5645_quirk_table[] = {static int cht_codec_init (struct snd_soc_pcm_runtime *runtime) { -int ret; -int jack_type; -struct snd_soc_codec *codec = runtime->codec;struct snd_soc_card *card = runtime->card;struct cht_mc_private *ctx =snd_soc_card_get_drvdata (runtime->card); +struct snd_soc_codec *codec = runtime->codec; +int jack_type; +int ret;if ((cht_rt5645_quirk &CHT_RT5645_SSP2_AIF2 ) || (cht_rt5645_quirk &CHT_RT5645_SSP0_AIF2 )) {
@@ -320,26 +317,26 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)rt5645_set_jack_detect (codec, &ctx->jack, &ctx->jack, &ctx->jack); -if (ctx->mclk) { -/* -* The firmware might enable the clock at -* boot (this information may or may not -* be reflected in the enable clock register). -* To change the rate we must disable the clock -* first to cover these cases. Due to common -* clock framework restrictions that do not allow -* to disable a clock that has not been enabled, -* we need to enable the clock first. -*/ - ret =clk_prepare_enable (ctx->mclk); -if (!ret) -clk_disable_unprepare (ctx->mclk); - ret =clk_set_rate (ctx->mclk,CHT_PLAT_CLK_3_HZ ); +/* +* The firmware might enable the clock at +* boot (this information may or may not +* be reflected in the enable clock register). +* To change the rate we must disable the clock +* first to cover these cases. Due to common +* clock framework restrictions that do not allow +* to disable a clock that has not been enabled, +* we need to enable the clock first. +*/ + ret =clk_prepare_enable (ctx->mclk); +if (!ret) +clk_disable_unprepare (ctx->mclk); + + ret =clk_set_rate (ctx->mclk,CHT_PLAT_CLK_3_HZ ); + +if (ret) +dev_err (runtime->dev,"unable to set MCLK rate\n" ); -if (ret) -dev_err (runtime->dev,"unable to set MCLK rate\n" ); - }return ret; }
@@ -545,15 +542,15 @@ struct acpi_chan_package { /* ACPICA seems to require 64 bit integers */static int snd_cht_mc_probe (struct platform_device *pdev) { -int ret_val =0 ; -int i; -struct cht_mc_private *drv;struct snd_soc_card *card = snd_soc_cards[0 ].soc_card;struct sst_acpi_mach *mach; +struct cht_mc_private *drv;const char *i2c_name =NULL ; -int dai_index =0 ;bool found = false;bool is_bytcr = false; +int dai_index =0 ; +int ret_val =0 ; +int i; drv =devm_kzalloc (&pdev->dev,sizeof (*drv),GFP_ATOMIC );if (!drv)
@@ -590,7 +587,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev)/* fixup codec name based on HID */ i2c_name =sst_acpi_find_name_from_hid (mach->id); -if (i2c_name !=NULL ) { +if (i2c_name) {snprintf (cht_rt5645_codec_name,sizeof (cht_rt5645_codec_name),"%s%s" ,"i2c-" , i2c_name); cht_dailink[dai_index].codec_name = cht_rt5645_codec_name;
Signature · 1 line
2.11.0
PATCH v2 4/9 ASoC: Intel: bytcht_da7213: cosmetic fixes
In reply to Pierre-Louis BossartReorder variable names, change tests
No functional change
--- sound/soc/intel/boards/bytcht_da7213.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/intel/boards/bytcht_da7213.c +3 -3
@@ -231,12 +231,12 @@ static char codec_name[16]; /* i2c-<HID>:00 with HID being 8 chars */static int bytcht_da7213_probe (struct platform_device *pdev) { -int ret_val =0 ; -int i;struct snd_soc_card *card;struct sst_acpi_mach *mach;const char *i2c_name =NULL ;int dai_index =0 ; +int ret_val =0 ; +int i; mach = (&pdev->dev)->platform_data; card = &bytcht_da7213_card;
@@ -253,7 +253,7 @@ static int bytcht_da7213_probe(struct platform_device *pdev)/* fixup codec name based on HID */ i2c_name =sst_acpi_find_name_from_hid (mach->id); -if (i2c_name !=NULL ) { +if (i2c_name) {snprintf (codec_name,sizeof (codec_name),"%s%s" ,"i2c-" , i2c_name); dailink[dai_index].codec_name = codec_name;
Signature · 1 line
2.11.0
PATCH v2 5/9 ASoC: Intel: bytcht_es8316: remove useless code
In reply to Pierre-Louis Bossartget_codec_dai() is not used, remove it
--- sound/soc/intel/boards/bytcht_es8316.c | 14 -------------- 1 file changed, 14 deletions(-)
sound/soc/intel/boards/bytcht_es8316.c +0 -14
@@ -37,20 +37,6 @@ struct byt_cht_es8316_private {struct clk *mclk; }; -#define CODEC_DAI1 "ES8316 HiFi" - -static inline struct snd_soc_dai *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,CODEC_DAI1 , -strlen (CODEC_DAI1 ))) -return rtd->codec_dai; - } -return NULL ; -} -static const struct snd_soc_dapm_widget byt_cht_es8316_widgets[] = {SND_SOC_DAPM_HP ("Headphone" ,NULL ),
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: Intel: bytcht_es8316: remove useless code" to the asoc tree
The patch
ASoC: Intel: bytcht_es8316: remove useless code
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
8a2eca50c618ef2affc140b38dc7fdc63d423e89Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Thu, 12 Oct 2017 18:38:01 -0500
Subject: [PATCH] ASoC: Intel: bytcht_es8316: remove useless code
get_codec_dai() is not used, remove it
--- sound/soc/intel/boards/bytcht_es8316.c | 14 -------------- 1 file changed, 14 deletions(-)
sound/soc/intel/boards/bytcht_es8316.c +0 -14
@@ -37,20 +37,6 @@ struct byt_cht_es8316_private {struct clk *mclk; }; -#define CODEC_DAI1 "ES8316 HiFi" - -static inline struct snd_soc_dai *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,CODEC_DAI1 , -strlen (CODEC_DAI1 ))) -return rtd->codec_dai; - } -return NULL ; -} -static const struct snd_soc_dapm_widget byt_cht_es8316_widgets[] = {SND_SOC_DAPM_HP ("Headphone" ,NULL ),
Signature · 1 line
2.14.1
PATCH v2 6/9 ASoC: Add helper to find codec_dai from dai_name
In reply to Pierre-Louis BossartCreate a helper function to remove duplicate code used in machine drivers
--- include/sound/soc.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
include/sound/soc.h +14 -0
@@ -1743,6 +1743,20 @@ struct snd_soc_dai *snd_soc_find_dai(#include <sound/soc-dai.h> +static inline +struct snd_soc_dai *snd_soc_card_get_codec_dai (struct snd_soc_card *card, +const char *dai_name) +{ +struct snd_soc_pcm_runtime *rtd; + +list_for_each_entry (rtd, &card->rtd_list, list) { +if (!strcmp (rtd->codec_dai->name, dai_name)) +return rtd->codec_dai; + } + +return NULL ; +} +#ifdef CONFIG_DEBUG_FS extern struct dentry *snd_soc_debugfs_root;#endif
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: Add helper to find codec_dai from dai_name" to the asoc tree
The patch
ASoC: Add helper to find codec_dai from dai_name
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
7c761b593e2c1dc6bc6c0c15ec338af1f00cabd7Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Thu, 12 Oct 2017 18:38:02 -0500
Subject: [PATCH] ASoC: Add helper to find codec_dai from dai_name
Create a helper function to remove duplicate code used in machine drivers
--- include/sound/soc.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
include/sound/soc.h +14 -0
@@ -1720,6 +1720,20 @@ struct snd_soc_dai *snd_soc_find_dai(#include <sound/soc-dai.h> +static inline +struct snd_soc_dai *snd_soc_card_get_codec_dai (struct snd_soc_card *card, +const char *dai_name) +{ +struct snd_soc_pcm_runtime *rtd; + +list_for_each_entry (rtd, &card->rtd_list, list) { +if (!strcmp (rtd->codec_dai->name, dai_name)) +return rtd->codec_dai; + } + +return NULL ; +} +#ifdef CONFIG_DEBUG_FS extern struct dentry *snd_soc_debugfs_root;#endif
Signature · 1 line
2.14.1
PATCH v2 7/9 ASoC: Intel: boards: use helper to get codec_dai
In reply to Pierre-Louis BossartRemove duplicate code with a common helper in all Intel machine drivers.
--- sound/soc/intel/boards/bxt_da7219_max98357a.c | 16 +--------------- sound/soc/intel/boards/bytcr_rt5640.c | 21 ++++----------------- sound/soc/intel/boards/bytcr_rt5651.c | 14 +------------- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 14 +------------- sound/soc/intel/boards/cht_bsw_rt5645.c | 20 ++++---------------- sound/soc/intel/boards/cht_bsw_rt5672.c | 14 +------------- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 16 +--------------- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 16 +--------------- 8 files changed, 14 insertions(+), 117 deletions(-)
sound/soc/intel/boards/bxt_da7219_max98357a.c +1 -15
@@ -55,20 +55,6 @@ enum { BXT_DPCM_AUDIO_HDMI3_PB, }; -static inline struct snd_soc_dai *bxt_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,BXT_DIALOG_CODEC_DAI , -strlen (BXT_DIALOG_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) {
@@ -77,7 +63,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,struct snd_soc_card *card = dapm->card;struct snd_soc_dai *codec_dai; - codec_dai =bxt_get_codec_dai (card); + codec_dai =snd_soc_card_get_codec_dai (card,BXT_DIALOG_CODEC_DAI );if (!codec_dai) {dev_err (card->dev,"Codec dai not found; Unable to set/unset codec pll\n" );return -EIO ;
sound/soc/intel/boards/bytcr_rt5640.c +4 -17
@@ -145,22 +145,6 @@ static void log_quirks(struct device *dev)#define BYT_CODEC_DAI1 "rt5640-aif1"#define BYT_CODEC_DAI2 "rt5640-aif2" -static inline struct snd_soc_dai *byt_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,BYT_CODEC_DAI1 , -strlen (BYT_CODEC_DAI1 ))) -return rtd->codec_dai; -if (!strncmp (rtd->codec_dai->name,BYT_CODEC_DAI2 , -strlen (BYT_CODEC_DAI2 ))) -return rtd->codec_dai; - - } -return NULL ; -} -static int platform_clock_control (struct snd_soc_dapm_widget *w,struct snd_kcontrol *k,int event) {
@@ -170,7 +154,10 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,struct byt_rt5640_private *priv =snd_soc_card_get_drvdata (card);int ret; - codec_dai =byt_get_codec_dai (card); + codec_dai =snd_soc_card_get_codec_dai (card,BYT_CODEC_DAI1 ); +if (!codec_dai) + codec_dai =snd_soc_card_get_codec_dai (card,BYT_CODEC_DAI2 ); +if (!codec_dai) {dev_err (card->dev,"Codec dai not found; Unable to set platform clock\n" );
sound/soc/intel/boards/bytcr_rt5651.c +1 -13
@@ -68,18 +68,6 @@ static void log_quirks(struct device *dev)#define BYT_CODEC_DAI1 "rt5651-aif1" -static inline struct snd_soc_dai *byt_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,BYT_CODEC_DAI1 , -strlen (BYT_CODEC_DAI1 ))) -return rtd->codec_dai; - } -return NULL ; -} -static int platform_clock_control (struct snd_soc_dapm_widget *w,struct snd_kcontrol *k,int event) {
@@ -89,7 +77,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,struct byt_rt5651_private *priv =snd_soc_card_get_drvdata (card);int ret; - codec_dai =byt_get_codec_dai (card); + codec_dai =snd_soc_card_get_codec_dai (card,BYT_CODEC_DAI1 );if (!codec_dai) {dev_err (card->dev,"Codec dai not found; Unable to set platform clock\n" );
sound/soc/intel/boards/cht_bsw_max98090_ti.c +1 -13
@@ -41,18 +41,6 @@ struct cht_mc_private {bool ts3a227e_present; }; -static inline struct snd_soc_dai *cht_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,CHT_CODEC_DAI , -strlen (CHT_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) {
@@ -62,7 +50,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,struct cht_mc_private *ctx =snd_soc_card_get_drvdata (card);int ret; - codec_dai =cht_get_codec_dai (card); + codec_dai =snd_soc_card_get_codec_dai (card,CHT_CODEC_DAI );if (!codec_dai) {dev_err (card->dev,"Codec dai not found; Unable to set platform clock\n" );return -EIO ;
sound/soc/intel/boards/cht_bsw_rt5645.c +4 -16
@@ -70,21 +70,6 @@ static void log_quirks(struct device *dev)dev_info (dev,"quirk SSP0_AIF2 enabled" ); } -static inline struct snd_soc_dai *cht_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,CHT_CODEC_DAI1 , -strlen (CHT_CODEC_DAI1 ))) -return rtd->codec_dai; -if (!strncmp (rtd->codec_dai->name,CHT_CODEC_DAI2 , -strlen (CHT_CODEC_DAI2 ))) -return rtd->codec_dai; - } -return NULL ; -} -static int platform_clock_control (struct snd_soc_dapm_widget *w,struct snd_kcontrol *k,int event) {
@@ -94,7 +79,10 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,struct cht_mc_private *ctx =snd_soc_card_get_drvdata (card);int ret; - codec_dai =cht_get_codec_dai (card); + codec_dai =snd_soc_card_get_codec_dai (card,CHT_CODEC_DAI1 ); +if (!codec_dai) + codec_dai =snd_soc_card_get_codec_dai (card,CHT_CODEC_DAI2 ); +if (!codec_dai) {dev_err (card->dev,"Codec dai not found; Unable to set platform clock\n" );return -EIO ;
sound/soc/intel/boards/cht_bsw_rt5672.c +1 -13
@@ -50,18 +50,6 @@ static struct snd_soc_jack_pin cht_bsw_headset_pins[] = { }, }; -static inline struct snd_soc_dai *cht_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,CHT_CODEC_DAI , -strlen (CHT_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) {
@@ -71,7 +59,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,struct cht_mc_private *ctx =snd_soc_card_get_drvdata (card);int ret; - codec_dai =cht_get_codec_dai (card); + codec_dai =snd_soc_card_get_codec_dai (card,CHT_CODEC_DAI );if (!codec_dai) {dev_err (card->dev,"Codec dai not found; Unable to set platform clock\n" );return -EIO ;
sound/soc/intel/boards/skl_nau88l25_max98357a.c +1 -15
@@ -54,20 +54,6 @@ enum { SKL_DPCM_AUDIO_HDMI3_PB, }; -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) {
@@ -76,7 +62,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,struct snd_soc_dai *codec_dai;int ret; - codec_dai =skl_get_codec_dai (card); + codec_dai =snd_soc_card_get_codec_dai (card,SKL_NUVOTON_CODEC_DAI );if (!codec_dai) {dev_err (card->dev,"Codec dai not found; Unable to set platform clock\n" );return -EIO ;
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +1 -15
@@ -57,20 +57,6 @@ enum { SKL_DPCM_AUDIO_HDMI3_PB, }; -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 const struct snd_kcontrol_new skylake_controls[] = {SOC_DAPM_PIN_SWITCH ("Headphone Jack" ),SOC_DAPM_PIN_SWITCH ("Headset Mic" ),
@@ -86,7 +72,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,struct snd_soc_dai *codec_dai;int ret; - codec_dai =skl_get_codec_dai (card); + codec_dai =snd_soc_card_get_codec_dai (card,SKL_NUVOTON_CODEC_DAI );if (!codec_dai) {dev_err (card->dev,"Codec dai not found\n" );return -EIO ;
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: Intel: boards: use helper to get codec_dai" to the asoc tree
The patch
ASoC: Intel: boards: use helper to get codec_dai
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
dfb6ec7ae57d33d2854a1af2dfe1278da8a7dedcMon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Thu, 12 Oct 2017 18:38:03 -0500
Subject: [PATCH] ASoC: Intel: boards: use helper to get codec_dai
Remove duplicate code with a common helper in all Intel machine drivers.
--- sound/soc/intel/boards/bxt_da7219_max98357a.c | 16 +--------------- sound/soc/intel/boards/bytcr_rt5640.c | 21 ++++----------------- sound/soc/intel/boards/bytcr_rt5651.c | 14 +------------- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 14 +------------- sound/soc/intel/boards/cht_bsw_rt5645.c | 20 ++++---------------- sound/soc/intel/boards/cht_bsw_rt5672.c | 14 +------------- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 16 +--------------- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 16 +--------------- 8 files changed, 14 insertions(+), 117 deletions(-)
sound/soc/intel/boards/bxt_da7219_max98357a.c +1 -15
@@ -55,20 +55,6 @@ enum { BXT_DPCM_AUDIO_HDMI3_PB, }; -static inline struct snd_soc_dai *bxt_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,BXT_DIALOG_CODEC_DAI , -strlen (BXT_DIALOG_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) {
@@ -77,7 +63,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,struct snd_soc_card *card = dapm->card;struct snd_soc_dai *codec_dai; - codec_dai =bxt_get_codec_dai (card); + codec_dai =snd_soc_card_get_codec_dai (card,BXT_DIALOG_CODEC_DAI );if (!codec_dai) {dev_err (card->dev,"Codec dai not found; Unable to set/unset codec pll\n" );return -EIO ;
sound/soc/intel/boards/bytcr_rt5640.c +4 -17
@@ -145,22 +145,6 @@ static void log_quirks(struct device *dev)#define BYT_CODEC_DAI1 "rt5640-aif1"#define BYT_CODEC_DAI2 "rt5640-aif2" -static inline struct snd_soc_dai *byt_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,BYT_CODEC_DAI1 , -strlen (BYT_CODEC_DAI1 ))) -return rtd->codec_dai; -if (!strncmp (rtd->codec_dai->name,BYT_CODEC_DAI2 , -strlen (BYT_CODEC_DAI2 ))) -return rtd->codec_dai; - - } -return NULL ; -} -static int platform_clock_control (struct snd_soc_dapm_widget *w,struct snd_kcontrol *k,int event) {
@@ -170,7 +154,10 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,struct byt_rt5640_private *priv =snd_soc_card_get_drvdata (card);int ret; - codec_dai =byt_get_codec_dai (card); + codec_dai =snd_soc_card_get_codec_dai (card,BYT_CODEC_DAI1 ); +if (!codec_dai) + codec_dai =snd_soc_card_get_codec_dai (card,BYT_CODEC_DAI2 ); +if (!codec_dai) {dev_err (card->dev,"Codec dai not found; Unable to set platform clock\n" );
sound/soc/intel/boards/bytcr_rt5651.c +1 -13
@@ -68,18 +68,6 @@ static void log_quirks(struct device *dev)#define BYT_CODEC_DAI1 "rt5651-aif1" -static inline struct snd_soc_dai *byt_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,BYT_CODEC_DAI1 , -strlen (BYT_CODEC_DAI1 ))) -return rtd->codec_dai; - } -return NULL ; -} -static int platform_clock_control (struct snd_soc_dapm_widget *w,struct snd_kcontrol *k,int event) {
@@ -89,7 +77,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,struct byt_rt5651_private *priv =snd_soc_card_get_drvdata (card);int ret; - codec_dai =byt_get_codec_dai (card); + codec_dai =snd_soc_card_get_codec_dai (card,BYT_CODEC_DAI1 );if (!codec_dai) {dev_err (card->dev,"Codec dai not found; Unable to set platform clock\n" );
sound/soc/intel/boards/cht_bsw_max98090_ti.c +1 -13
@@ -41,18 +41,6 @@ struct cht_mc_private {bool ts3a227e_present; }; -static inline struct snd_soc_dai *cht_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,CHT_CODEC_DAI , -strlen (CHT_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) {
@@ -62,7 +50,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,struct cht_mc_private *ctx =snd_soc_card_get_drvdata (card);int ret; - codec_dai =cht_get_codec_dai (card); + codec_dai =snd_soc_card_get_codec_dai (card,CHT_CODEC_DAI );if (!codec_dai) {dev_err (card->dev,"Codec dai not found; Unable to set platform clock\n" );return -EIO ;
sound/soc/intel/boards/cht_bsw_rt5645.c +4 -16
@@ -70,21 +70,6 @@ static void log_quirks(struct device *dev)dev_info (dev,"quirk SSP0_AIF2 enabled" ); } -static inline struct snd_soc_dai *cht_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,CHT_CODEC_DAI1 , -strlen (CHT_CODEC_DAI1 ))) -return rtd->codec_dai; -if (!strncmp (rtd->codec_dai->name,CHT_CODEC_DAI2 , -strlen (CHT_CODEC_DAI2 ))) -return rtd->codec_dai; - } -return NULL ; -} -static int platform_clock_control (struct snd_soc_dapm_widget *w,struct snd_kcontrol *k,int event) {
@@ -94,7 +79,10 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,struct cht_mc_private *ctx =snd_soc_card_get_drvdata (card);int ret; - codec_dai =cht_get_codec_dai (card); + codec_dai =snd_soc_card_get_codec_dai (card,CHT_CODEC_DAI1 ); +if (!codec_dai) + codec_dai =snd_soc_card_get_codec_dai (card,CHT_CODEC_DAI2 ); +if (!codec_dai) {dev_err (card->dev,"Codec dai not found; Unable to set platform clock\n" );return -EIO ;
sound/soc/intel/boards/cht_bsw_rt5672.c +1 -13
@@ -50,18 +50,6 @@ static struct snd_soc_jack_pin cht_bsw_headset_pins[] = { }, }; -static inline struct snd_soc_dai *cht_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,CHT_CODEC_DAI , -strlen (CHT_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) {
@@ -71,7 +59,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,struct cht_mc_private *ctx =snd_soc_card_get_drvdata (card);int ret; - codec_dai =cht_get_codec_dai (card); + codec_dai =snd_soc_card_get_codec_dai (card,CHT_CODEC_DAI );if (!codec_dai) {dev_err (card->dev,"Codec dai not found; Unable to set platform clock\n" );return -EIO ;
sound/soc/intel/boards/skl_nau88l25_max98357a.c +1 -15
@@ -54,20 +54,6 @@ enum { SKL_DPCM_AUDIO_HDMI3_PB, }; -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) {
@@ -76,7 +62,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,struct snd_soc_dai *codec_dai;int ret; - codec_dai =skl_get_codec_dai (card); + codec_dai =snd_soc_card_get_codec_dai (card,SKL_NUVOTON_CODEC_DAI );if (!codec_dai) {dev_err (card->dev,"Codec dai not found; Unable to set platform clock\n" );return -EIO ;
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +1 -15
@@ -57,20 +57,6 @@ enum { SKL_DPCM_AUDIO_HDMI3_PB, }; -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 const struct snd_kcontrol_new skylake_controls[] = {SOC_DAPM_PIN_SWITCH ("Headphone Jack" ),SOC_DAPM_PIN_SWITCH ("Headset Mic" ),
@@ -86,7 +72,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,struct snd_soc_dai *codec_dai;int ret; - codec_dai =skl_get_codec_dai (card); + codec_dai =snd_soc_card_get_codec_dai (card,SKL_NUVOTON_CODEC_DAI );if (!codec_dai) {dev_err (card->dev,"Codec dai not found\n" );return -EIO ;
Signature · 1 line
2.14.1
PATCH v2 8/9 ASoC: Intel: boards: fix off-by-one dailink id
In reply to Pierre-Louis BossartFor some reason the Atom/HiFi2 machine drivers use an id=1 instead of zero as done on all other platforms. This gets in the way of topology-based matching, realign for consistency. This should not have any functional impact on existing solutions with don't rely on topology.
--- sound/soc/intel/boards/bytcht_da7213.c | 2 +- sound/soc/intel/boards/bytcht_es8316.c | 2 +- sound/soc/intel/boards/bytcht_nocodec.c | 2 +- sound/soc/intel/boards/bytcr_rt5640.c | 2 +- sound/soc/intel/boards/bytcr_rt5651.c | 2 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-)
sound/soc/intel/boards/bytcht_da7213.c +1 -1
@@ -197,7 +197,7 @@ static struct snd_soc_dai_link dailink[] = {/* back ends */ { .name = "SSP2-Codec", - .id = 1, + .id = 0, .cpu_dai_name = "ssp2-port", .platform_name = "sst-mfld-platform", .no_pcm = 1,
sound/soc/intel/boards/bytcht_es8316.c +1 -1
@@ -209,7 +209,7 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = {* require SSP0 will not work. */ .name = "SSP2-Codec", - .id = 1, + .id = 0, .cpu_dai_name = "ssp2-port", .platform_name = "sst-mfld-platform", .no_pcm = 1,
sound/soc/intel/boards/bytcht_nocodec.c +1 -1
@@ -145,7 +145,7 @@ static struct snd_soc_dai_link dais[] = {/* back ends */ { .name = "SSP2-LowSpeed Connector", - .id = 1, + .id = 0, .cpu_dai_name = "ssp2-port", .platform_name = "sst-mfld-platform", .no_pcm = 1,
sound/soc/intel/boards/bytcr_rt5640.c +1 -1
@@ -690,7 +690,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {/* back ends */ { .name = "SSP2-Codec", - .id = 1, + .id = 0, .cpu_dai_name = "ssp2-port", /* overwritten for ssp0 routing */ .platform_name = "sst-mfld-platform", .no_pcm = 1,
sound/soc/intel/boards/bytcr_rt5651.c +1 -1
@@ -401,7 +401,7 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {/* back ends */ { .name = "SSP2-Codec", - .id = 1, + .id = 0, .cpu_dai_name = "ssp2-port", .platform_name = "sst-mfld-platform", .no_pcm = 1,
sound/soc/intel/boards/cht_bsw_max98090_ti.c +1 -1
@@ -361,7 +361,7 @@ static struct snd_soc_dai_link cht_dailink[] = {/* back ends */ { .name = "SSP2-Codec", - .id = 1, + .id = 0, .cpu_dai_name = "ssp2-port", .platform_name = "sst-mfld-platform", .no_pcm = 1,
sound/soc/intel/boards/cht_bsw_rt5645.c +1 -1
@@ -457,7 +457,7 @@ static struct snd_soc_dai_link cht_dailink[] = {/* back ends */ { .name = "SSP2-Codec", - .id = 1, + .id = 0, .cpu_dai_name = "ssp2-port", .platform_name = "sst-mfld-platform", .no_pcm = 1,
sound/soc/intel/boards/cht_bsw_rt5672.c +1 -1
@@ -315,7 +315,7 @@ static struct snd_soc_dai_link cht_dailink[] = { {/* SSP2 - Codec */ .name = "SSP2-Codec", - .id = 1, + .id = 0, .cpu_dai_name = "ssp2-port", .platform_name = "sst-mfld-platform", .no_pcm = 1,
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: Intel: boards: fix off-by-one dailink id" to the asoc tree
The patch
ASoC: Intel: boards: fix off-by-one dailink id
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
149f77575906d7dca1c62ee5a5539b6b7e851f46Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Thu, 12 Oct 2017 18:38:04 -0500
Subject: [PATCH] ASoC: Intel: boards: fix off-by-one dailink id
For some reason the Atom/HiFi2 machine drivers use an id=1 instead of zero as done on all other platforms. This gets in the way of topology-based matching, realign for consistency. This should not have any functional impact on existing solutions with don't rely on topology.
--- sound/soc/intel/boards/bytcht_da7213.c | 2 +- sound/soc/intel/boards/bytcht_es8316.c | 2 +- sound/soc/intel/boards/bytcht_nocodec.c | 2 +- sound/soc/intel/boards/bytcr_rt5640.c | 2 +- sound/soc/intel/boards/bytcr_rt5651.c | 2 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-)
sound/soc/intel/boards/bytcht_da7213.c +1 -1
@@ -197,7 +197,7 @@ static struct snd_soc_dai_link dailink[] = {/* back ends */ { .name = "SSP2-Codec", - .id = 1, + .id = 0, .cpu_dai_name = "ssp2-port", .platform_name = "sst-mfld-platform", .no_pcm = 1,
sound/soc/intel/boards/bytcht_es8316.c +1 -1
@@ -209,7 +209,7 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = {* require SSP0 will not work. */ .name = "SSP2-Codec", - .id = 1, + .id = 0, .cpu_dai_name = "ssp2-port", .platform_name = "sst-mfld-platform", .no_pcm = 1,
sound/soc/intel/boards/bytcht_nocodec.c +1 -1
@@ -145,7 +145,7 @@ static struct snd_soc_dai_link dais[] = {/* back ends */ { .name = "SSP2-LowSpeed Connector", - .id = 1, + .id = 0, .cpu_dai_name = "ssp2-port", .platform_name = "sst-mfld-platform", .no_pcm = 1,
sound/soc/intel/boards/bytcr_rt5640.c +1 -1
@@ -690,7 +690,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {/* back ends */ { .name = "SSP2-Codec", - .id = 1, + .id = 0, .cpu_dai_name = "ssp2-port", /* overwritten for ssp0 routing */ .platform_name = "sst-mfld-platform", .no_pcm = 1,
sound/soc/intel/boards/bytcr_rt5651.c +1 -1
@@ -401,7 +401,7 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {/* back ends */ { .name = "SSP2-Codec", - .id = 1, + .id = 0, .cpu_dai_name = "ssp2-port", .platform_name = "sst-mfld-platform", .no_pcm = 1,
sound/soc/intel/boards/cht_bsw_max98090_ti.c +1 -1
@@ -361,7 +361,7 @@ static struct snd_soc_dai_link cht_dailink[] = {/* back ends */ { .name = "SSP2-Codec", - .id = 1, + .id = 0, .cpu_dai_name = "ssp2-port", .platform_name = "sst-mfld-platform", .no_pcm = 1,
sound/soc/intel/boards/cht_bsw_rt5645.c +1 -1
@@ -457,7 +457,7 @@ static struct snd_soc_dai_link cht_dailink[] = {/* back ends */ { .name = "SSP2-Codec", - .id = 1, + .id = 0, .cpu_dai_name = "ssp2-port", .platform_name = "sst-mfld-platform", .no_pcm = 1,
sound/soc/intel/boards/cht_bsw_rt5672.c +1 -1
@@ -315,7 +315,7 @@ static struct snd_soc_dai_link cht_dailink[] = { {/* SSP2 - Codec */ .name = "SSP2-Codec", - .id = 1, + .id = 0, .cpu_dai_name = "ssp2-port", .platform_name = "sst-mfld-platform", .no_pcm = 1,
Signature · 1 line
2.14.1
PATCH v2 9/9 ASoC: Intel: boards: remove hard-coded compressed dailinks
In reply to Pierre-Louis BossartThe hard-coded compressed dailinks are not supported using publicly-available firmwares, which creates unnecessary user confusion [1]. Even if the firmware was available, the mainline code does not have the required .dynamic=1 and .dpcm_playback=1 fields so probably never worked as is, and last and they conflict with topology-defined streams.
Remove them and move on. This can be re-enabled with SOF later in a more flexible manner.
[1] http://mailman.alsa-project.org/pipermail/alsa-devel/2017-August/124868.html
--- sound/soc/intel/boards/bytcht_da7213.c | 9 --------- sound/soc/intel/boards/bytcht_es8316.c | 9 --------- sound/soc/intel/boards/bytcht_nocodec.c | 8 -------- sound/soc/intel/boards/bytcr_rt5640.c | 11 +---------- sound/soc/intel/boards/bytcr_rt5651.c | 11 +---------- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 8 -------- sound/soc/intel/boards/cht_bsw_rt5645.c | 8 -------- sound/soc/intel/boards/cht_bsw_rt5672.c | 8 -------- 8 files changed, 2 insertions(+), 70 deletions(-)
sound/soc/intel/boards/bytcht_da7213.c +0 -9
@@ -185,14 +185,6 @@ static struct snd_soc_dai_link dailink[] = { .dpcm_playback = 1, .ops = &aif1_ops, }, - [MERR_DPCM_COMPR] = { - .name = "Compressed Port", - .stream_name = "Compress", - .cpu_dai_name = "compress-cpu-dai", - .codec_dai_name = "snd-soc-dummy-dai", - .codec_name = "snd-soc-dummy", - .platform_name = "sst-mfld-platform", - },/* CODEC<->CODEC link */ /* back ends */ {
@@ -243,7 +235,6 @@ static int bytcht_da7213_probe(struct platform_device *pdev) card->dev = &pdev->dev;/* fix index of codec dai */ - dai_index =MERR_DPCM_COMPR +1 ;for (i =0 ; i <ARRAY_SIZE (dailink); i++) {if (!strcmp (dailink[i].codec_name,"i2c-DLGS7213:00" )) { dai_index = i;
sound/soc/intel/boards/bytcht_es8316.c +0 -9
@@ -194,15 +194,6 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { .ops = &byt_cht_es8316_aif1_ops, }, - [MERR_DPCM_COMPR] = { - .name = "Compressed Port", - .stream_name = "Compress", - .cpu_dai_name = "compress-cpu-dai", - .codec_dai_name = "snd-soc-dummy-dai", - .codec_name = "snd-soc-dummy", - .platform_name = "sst-mfld-platform", - }, -/* back ends */ {/* Only SSP2 has been tested here, so BYT-CR platforms that
sound/soc/intel/boards/bytcht_nocodec.c +0 -8
@@ -133,14 +133,6 @@ static struct snd_soc_dai_link dais[] = { .dpcm_playback = 1, .ops = &aif1_ops, }, - [MERR_DPCM_COMPR] = { - .name = "Compressed Port", - .stream_name = "Compress", - .cpu_dai_name = "compress-cpu-dai", - .codec_dai_name = "snd-soc-dummy-dai", - .codec_name = "snd-soc-dummy", - .platform_name = "sst-mfld-platform", - },/* CODEC<->CODEC link */ /* back ends */ {
sound/soc/intel/boards/bytcr_rt5640.c +1 -10
@@ -679,14 +679,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { .dpcm_playback = 1, .ops = &byt_rt5640_aif1_ops, }, - [MERR_DPCM_COMPR] = { - .name = "Baytrail Compressed Port", - .stream_name = "Baytrail Compress", - .cpu_dai_name = "compress-cpu-dai", - .codec_dai_name = "snd-soc-dummy-dai", - .codec_name = "snd-soc-dummy", - .platform_name = "sst-mfld-platform", - },/* back ends */ { .name = "SSP2-Codec",
@@ -748,7 +740,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)struct sst_acpi_mach *mach;const char *i2c_name =NULL ;int ret_val =0 ; -int dai_index; +int dai_index =0 ;int i; is_bytcr = false;
@@ -762,7 +754,6 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)snd_soc_card_set_drvdata (&byt_rt5640_card, priv);/* fix index of codec dai */ - dai_index =MERR_DPCM_COMPR +1 ;for (i =0 ; i <ARRAY_SIZE (byt_rt5640_dais); i++) {if (!strcmp (byt_rt5640_dais[i].codec_name,"i2c-10EC5640:00" )) { dai_index = i;
sound/soc/intel/boards/bytcr_rt5651.c +1 -10
@@ -389,14 +389,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { .dpcm_playback = 1, .ops = &byt_rt5651_aif1_ops, }, - [MERR_DPCM_COMPR] = { - .name = "Compressed Port", - .stream_name = "Compress", - .cpu_dai_name = "compress-cpu-dai", - .codec_dai_name = "snd-soc-dummy-dai", - .codec_name = "snd-soc-dummy", - .platform_name = "sst-mfld-platform", - },/* CODEC<->CODEC link */ /* back ends */ {
@@ -440,7 +432,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)struct sst_acpi_mach *mach;const char *i2c_name =NULL ;int ret_val =0 ; -int dai_index; +int dai_index =0 ;int i; priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_ATOMIC );
@@ -454,7 +446,6 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)snd_soc_card_set_drvdata (&byt_rt5651_card, priv);/* fix index of codec dai */ - dai_index =MERR_DPCM_COMPR +1 ;for (i =0 ; i <ARRAY_SIZE (byt_rt5651_dais); i++) {if (!strcmp (byt_rt5651_dais[i].codec_name,"i2c-10EC5651:00" )) { dai_index = i;
sound/soc/intel/boards/cht_bsw_max98090_ti.c +0 -8
@@ -350,14 +350,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .dpcm_playback = 1, .ops = &cht_aif1_ops, }, - [MERR_DPCM_COMPR] = { - .name = "Compressed Port", - .stream_name = "Compress", - .cpu_dai_name = "compress-cpu-dai", - .codec_dai_name = "snd-soc-dummy-dai", - .codec_name = "snd-soc-dummy", - .platform_name = "sst-mfld-platform", - },/* back ends */ { .name = "SSP2-Codec",
sound/soc/intel/boards/cht_bsw_rt5645.c +0 -8
@@ -445,14 +445,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .dpcm_playback = 1, .ops = &cht_aif1_ops, }, - [MERR_DPCM_COMPR] = { - .name = "Compressed Port", - .stream_name = "Compress", - .cpu_dai_name = "compress-cpu-dai", - .codec_dai_name = "snd-soc-dummy-dai", - .codec_name = "snd-soc-dummy", - .platform_name = "sst-mfld-platform", - },/* CODEC<->CODEC link */ /* back ends */ {
sound/soc/intel/boards/cht_bsw_rt5672.c +0 -8
@@ -302,14 +302,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .dpcm_playback = 1, .ops = &cht_aif1_ops, }, - [MERR_DPCM_COMPR] = { - .name = "Compressed Port", - .stream_name = "Compress", - .cpu_dai_name = "compress-cpu-dai", - .codec_dai_name = "snd-soc-dummy-dai", - .codec_name = "snd-soc-dummy", - .platform_name = "sst-mfld-platform", - },/* Back End DAI links */ {
Signature · 1 line
2.11.0
Quoted 8 lines · Pierre-Louis Bossart
As discussed on the alsa-devel mailing list, here is a set of patches to fix
1. previous feedback on
bytcht_rt5651- no new functionality beyond what was already reviewed
2. cosmetic issues (variables in reverse xmas tree order, etc)
3. unnecessary clock tests
4. addition of a helper to remove duplicate code across machine drivers
Quoted 6 lines
The last two patches were not included in the first pass, they correct an off-by-one issue which has no functional impact and remove the hard-codec compressed dailinks which don't currently work with the mainline code+publicly available firmware.
Pierre-Louis Bossart (9):
All
Quoted 10 lines · Pierre-Louis Bossart
As discussed on the alsa-devel mailing list, here is a set of patches to fix
1. previous feedback on
bytcht_rt5651- no new functionality beyond what was already reviewed
2. cosmetic issues (variables in reverse xmas tree order, etc)
3. unnecessary clock tests
4. addition of a helper to remove duplicate code across machine drivers
Quoted 5 lines
The last two patches were not included in the first pass, they correct an off-by-one issue which has no functional impact and remove the hard-codec compressed dailinks which don't currently work with the mainline code+publicly available firmware.
Patch 6 can be folded into 5, but it's up to you. Either choice:
Quoted 26 lines
Pierre-Louis Bossart (9):
ASoC: Intel:bytcr_rt5651: add MCLK, quirks and cleanups
ASoC: Intel:bytcr_rt5640: cosmetic fixes
ASoC: Intel:cht_bsw_rt5645: cosmetic fixes
ASoC: Intel:bytcht_da7213: cosmetic fixes
ASoC: Intel:bytcht_es8316: remove useless code
ASoC: Add helper to findcodec_daifromdai_name
ASoC: Intel: boards: use helper to getcodec_dai
ASoC: Intel: boards: fix off-by-one dailink id
ASoC: Intel: boards: remove hard-coded compressed dailinksinclude/sound/soc.h | 14 ++ sound/soc/intel/boards/bxt_da7219_max98357a.c | 16 +- sound/soc/intel/boards/bytcht_da7213.c | 17 +- sound/soc/intel/boards/bytcht_es8316.c | 25 +-- sound/soc/intel/boards/bytcht_nocodec.c | 10 +- sound/soc/intel/boards/bytcr_rt5640.c | 105 ++++------- sound/soc/intel/boards/bytcr_rt5651.c | 236 +++++++++++++++++++++--- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 24 +-- sound/soc/intel/boards/cht_bsw_rt5645.c | 103 ++++------- sound/soc/intel/boards/cht_bsw_rt5672.c | 24 +-- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 16 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 16 +- 12 files changed, 318 insertions(+), 288 deletions(-)
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
Quoted 10 lines · Pierre-Louis Bossart
As discussed on the alsa-devel mailing list, here is a set of patches to fix
1. previous feedback on
bytcht_rt5651- no new functionality beyond what was already reviewed
2. cosmetic issues (variables in reverse xmas tree order, etc)
3. unnecessary clock tests
4. addition of a helper to remove duplicate code across machine drivers
Quoted 5 lines
The last two patches were not included in the first pass, they correct an off-by-one issue which has no functional impact and remove the hard-codec compressed dailinks which don't currently work with the mainline code+publicly available firmware.
Patch 6 can be folded into 5, but it's up to you. Either choice:
P.S. Nice clean up!
Quoted 26 lines
Pierre-Louis Bossart (9):
ASoC: Intel:bytcr_rt5651: add MCLK, quirks and cleanups
ASoC: Intel:bytcr_rt5640: cosmetic fixes
ASoC: Intel:cht_bsw_rt5645: cosmetic fixes
ASoC: Intel:bytcht_da7213: cosmetic fixes
ASoC: Intel:bytcht_es8316: remove useless code
ASoC: Add helper to findcodec_daifromdai_name
ASoC: Intel: boards: use helper to getcodec_dai
ASoC: Intel: boards: fix off-by-one dailink id
ASoC: Intel: boards: remove hard-coded compressed dailinksinclude/sound/soc.h | 14 ++ sound/soc/intel/boards/bxt_da7219_max98357a.c | 16 +- sound/soc/intel/boards/bytcht_da7213.c | 17 +- sound/soc/intel/boards/bytcht_es8316.c | 25 +-- sound/soc/intel/boards/bytcht_nocodec.c | 10 +- sound/soc/intel/boards/bytcr_rt5640.c | 105 ++++------- sound/soc/intel/boards/bytcr_rt5651.c | 236 +++++++++++++++++++++--- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 24 +-- sound/soc/intel/boards/cht_bsw_rt5645.c | 103 ++++------- sound/soc/intel/boards/cht_bsw_rt5672.c | 24 +-- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 16 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 16 +- 12 files changed, 318 insertions(+), 288 deletions(-)
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy