ASoC: Intel: avs: New boards and fixes to existing ones
Subsystems (3)
Cezary Rojewski
maintainercover ASoC: Intel: avs: New boards and fixes to existing ones
Series adds support for two boards: es8336 and rt5663. The former is utilized by some KBL-based tablets whereas the latter unlocks Chromebooks with rt5663 i2c codecs.
As existing implementation of es8336 (es8316.c) codec driver is not prepared to cope with KBL-based platforms, couple of small, clock-related changes precede anything avs-driver related.
The tail of patchset cleans up existing implementation of rt5682.
Amadeusz Sławiński (2):
ASoC: Intel: avs: Add rt5663 machine board
ASoC: Intel: avs: Load rt5663 board on KBL-based platforms
Cezary Rojewski (6):
ASoC: codecs: es8316: Add support for 24 MHz MCLK
ASoC: codecs: es8316: Add support for S24_3LE format
ASoC: Intel: avs: Add es8336 machine board
ASoC: Intel: avs: Load es8336 board on KBL-based platforms
ASoC: Intel: avs: rt5682: Add missing components
ASoC: Intel: avs: rt5682: Tidy up hw_params()
sound/soc/codecs/es8316.c | 5 +- sound/soc/intel/avs/board_selection.c | 16 ++ sound/soc/intel/avs/boards/Kconfig | 20 ++ sound/soc/intel/avs/boards/Makefile | 4 + sound/soc/intel/avs/boards/es8336.c | 315 ++++++++++++++++++++++++++ sound/soc/intel/avs/boards/rt5663.c | 254 +++++++++++++++++++++ sound/soc/intel/avs/boards/rt5682.c | 67 +++--- 7 files changed, 652 insertions(+), 29 deletions(-) create mode 100644 sound/soc/intel/avs/boards/es8336.c create mode 100644 sound/soc/intel/avs/boards/rt5663.c
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH 1/8 ASoC: codecs: es8316: Add support for 24 MHz MCLK
MCLK operates on 24MHz on Intel KabyLake-based platforms. To support that frequency add new MCLK-LRCK ratio.
While at it, utilize ARRAY_SIZE rather than hardcode to improve robustness.
--- sound/soc/codecs/es8316.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/es8316.c +2 -2
@@ -27,9 +27,9 @@* MCLK/LRCK ratios, but we also add ratio 400, which is commonly used on * Intel Cherry Trail platforms (19.2MHz MCLK, 48kHz LRCK). */ -#define NR_SUPPORTED_MCLK_LRCK_RATIOS 6 +#define NR_SUPPORTED_MCLK_LRCK_RATIOS ARRAY_SIZE(supported_mclk_lrck_ratios)static const unsigned int supported_mclk_lrck_ratios[] = { -256 ,384 ,400 ,512 ,768 ,1024 +256 ,384 ,400 ,500 ,512 ,768 ,1024 };struct es8316_priv {
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH 2/8 ASoC: codecs: es8316: Add support for S24_3LE format
In reply to Cezary RojewskiCodec supports words that are 16/18/20/24/32 bits long. In case of 24, it should be treated as 24/24 not 24/32 i.e.: 24 valid bit-depth in 24 bit-depth container.
For compatibility reasons, S24_LE is left as is.
--- sound/soc/codecs/es8316.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/es8316.c +1 -0
@@ -494,6 +494,7 @@ static int es8316_pcm_hw_params(struct snd_pcm_substream *substream, bclk_divider /=20 ;break ;case SNDRV_PCM_FORMAT_S24_LE : +case SNDRV_PCM_FORMAT_S24_3LE : wordlen =ES8316_SERDATA2_LEN_24 ; bclk_divider /=24 ;break ;
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH 3/8 ASoC: Intel: avs: Add es8336 machine board
In reply to Cezary RojewskiTo support AVS-es8336 configuration add machine board connecting AVS platform component driver with es8316 codec one.
--- sound/soc/intel/avs/boards/Kconfig | 10 + sound/soc/intel/avs/boards/Makefile | 2 + sound/soc/intel/avs/boards/es8336.c | 315 ++++++++++++++++++++++++++++ 3 files changed, 327 insertions(+) create mode 100644 sound/soc/intel/avs/boards/es8336.c
sound/soc/intel/avs/boards/Kconfig +10 -0
@@ -22,6 +22,16 @@ config SND_SOC_INTEL_AVS_MACH_DMIC Say Y or m if you have such a device. This is a recommended option. If unsure select "N". +config SND_SOC_INTEL_AVS_MACH_ES8336 + tristate "es8336 I2S board" + depends on X86 && I2C + depends on MFD_INTEL_LPSS || COMPILE_TEST + select SND_SOC_ES8316 + help + This adds support for AVS with ES8336 I2S codec configuration. + Say Y or m if you have such a device. This is a recommended option. + If unsure select "N". + config SND_SOC_INTEL_AVS_MACH_HDAUDIO tristate "HD-Audio generic board" select SND_SOC_HDA
sound/soc/intel/avs/boards/Makefile +2 -0
@@ -2,6 +2,7 @@ snd-soc-avs-da7219-objs := da7219.o snd-soc-avs-dmic-objs := dmic.o +snd-soc-avs-es8336-objs := es8336.o snd-soc-avs-hdaudio-objs := hdaudio.o snd-soc-avs-i2s-test-objs := i2s_test.o snd-soc-avs-max98927-objs := max98927.o
@@ -17,6 +18,7 @@ snd-soc-avs-ssm4567-objs := ssm4567.o obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219) += snd-soc-avs-da7219.o obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC) += snd-soc-avs-dmic.o +obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336) += snd-soc-avs-es8336.o obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO) += snd-soc-avs-hdaudio.o obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST) += snd-soc-avs-i2s-test.o obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927) += snd-soc-avs-max98927.o
sound/soc/intel/avs/boards/es8336.c new file +315 -0
315 lines not on this page · raw message
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH 4/8 ASoC: Intel: avs: Load es8336 board on KBL-based platforms
In reply to Cezary RojewskiUpdate board-selection tables to account for es8336 on KBL-based platforms.
--- sound/soc/intel/avs/board_selection.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/soc/intel/avs/board_selection.c +8 -0
@@ -159,6 +159,14 @@ static struct snd_soc_acpi_mach avs_kbl_i2s_machines[] = { }, .tplg_filename = "da7219-tplg.bin", }, + { + .id = "ESSX8336", + .drv_name = "avs_es8336", + .mach_params = { + .i2s_link_mask = AVS_SSP(0), + }, + .tplg_filename = "es8336-tplg.bin", + }, {}, };
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH 5/8 ASoC: Intel: avs: Add rt5663 machine board
In reply to Cezary RojewskiFrom: Amadeusz Sławiński <[email protected]>
To support AVS-rt5663 configuration add machine board connecting AVS platform component driver with rt5663 codec one.
--- sound/soc/intel/avs/boards/Kconfig | 10 ++ sound/soc/intel/avs/boards/Makefile | 2 + sound/soc/intel/avs/boards/rt5663.c | 254 ++++++++++++++++++++++++++++ 3 files changed, 266 insertions(+) create mode 100644 sound/soc/intel/avs/boards/rt5663.c
sound/soc/intel/avs/boards/Kconfig +10 -0
@@ -125,6 +125,16 @@ config SND_SOC_INTEL_AVS_MACH_RT298 Say Y or m if you have such a device. This is a recommended option. If unsure select "N". +config SND_SOC_INTEL_AVS_MACH_RT5663 + tristate "rt5663 in I2S mode" + depends on I2C + depends on MFD_INTEL_LPSS || COMPILE_TEST + select SND_SOC_RT5663 + help + This adds support for ASoC machine driver with RT5663 I2S audio codec. + Say Y or m if you have such a device. This is a recommended option. + If unsure select "N". + config SND_SOC_INTEL_AVS_MACH_RT5682 tristate "rt5682 in I2S mode" depends on I2C
sound/soc/intel/avs/boards/Makefile +2 -0
@@ -13,6 +13,7 @@ snd-soc-avs-probe-objs := probe.o snd-soc-avs-rt274-objs := rt274.o snd-soc-avs-rt286-objs := rt286.o snd-soc-avs-rt298-objs := rt298.o +snd-soc-avs-rt5663-objs := rt5663.o snd-soc-avs-rt5682-objs := rt5682.o snd-soc-avs-ssm4567-objs := ssm4567.o
@@ -29,5 +30,6 @@ obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE) += snd-soc-avs-probe.o obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT274) += snd-soc-avs-rt274.o obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT286) += snd-soc-avs-rt286.o obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT298) += snd-soc-avs-rt298.o +obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663) += snd-soc-avs-rt5663.o obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682) += snd-soc-avs-rt5682.o obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567) += snd-soc-avs-ssm4567.o
sound/soc/intel/avs/boards/rt5663.c new file +254 -0
254 lines not on this page · raw message
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH 6/8 ASoC: Intel: avs: Load rt5663 board on KBL-based platforms
In reply to Cezary RojewskiFrom: Amadeusz Sławiński <[email protected]>
Update board-selection tables to account for rt5663 on KBL-based platforms.
--- sound/soc/intel/avs/board_selection.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/soc/intel/avs/board_selection.c +8 -0
@@ -135,6 +135,14 @@ static struct snd_soc_acpi_mach avs_kbl_i2s_machines[] = { }, .tplg_filename = "max98927-tplg.bin", }, + { + .id = "10EC5663", + .drv_name = "avs_rt5663", + .mach_params = { + .i2s_link_mask = AVS_SSP(1), + }, + .tplg_filename = "rt5663-tplg.bin", + }, { .id = "MX98373", .drv_name = "avs_max98373",
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH 7/8 ASoC: Intel: avs: rt5682: Add missing components
In reply to Cezary RojewskiAlign with what's done for all other boards and allocate jacks pins dynamically and explicitly specify ->dai_fmt for the DAI link.
The latter clears any ambiguity - given the current implementation of the codec driver, specifying format is optional but should the implementation change, the sound card behaviour may be undesired.
--- sound/soc/intel/avs/boards/rt5682.c | 32 +++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-)
sound/soc/intel/avs/boards/rt5682.c +24 -8
@@ -79,14 +79,31 @@ static const struct snd_soc_dapm_route card_base_routes[] = { { "IN1P", NULL, "Headset Mic" }, }; +static struct snd_soc_jack_pin card_jack_pins[] = { + { + .pin ="Headphone Jack" , + .mask =SND_JACK_HEADPHONE , + }, + { + .pin ="Headset Mic" , + .mask =SND_JACK_MICROPHONE , + }, +}; +static int avs_rt5682_codec_init (struct snd_soc_pcm_runtime *runtime) {struct snd_soc_component *component =asoc_rtd_to_codec (runtime,0 )->component; -struct snd_soc_jack *jack;struct snd_soc_card *card = runtime->card; -int ret; +struct snd_soc_jack_pin *pins; +struct snd_soc_jack *jack; +int num_pins, ret; jack =snd_soc_card_get_drvdata (card); + num_pins =ARRAY_SIZE (card_jack_pins); + + pins =devm_kmemdup (card->dev, card_jack_pins,sizeof (*pins) * num_pins,GFP_KERNEL ); +if (!pins) +return -ENOMEM ;/* Need to enable ASRC function for 24MHz mclk rate */ if ((avs_rt5682_quirk & AVS_RT5682_MCLK_EN) &&
@@ -95,12 +112,10 @@ static int avs_rt5682_codec_init(struct snd_soc_pcm_runtime *runtime) RT5682_AD_STEREO1_FILTER, RT5682_CLK_SEL_I2S1_ASRC); } -/* -* Headset buttons map to the google Reference headset. -* These can be configured by userspace. -*/ - ret =snd_soc_card_jack_new (card,"Headset" ,SND_JACK_HEADSET |SND_JACK_BTN_0 | -SND_JACK_BTN_1 |SND_JACK_BTN_2 |SND_JACK_BTN_3 , jack); + + ret =snd_soc_card_jack_new_pins (card,"Headset Jack" ,SND_JACK_HEADSET |SND_JACK_BTN_0 | +SND_JACK_BTN_1 |SND_JACK_BTN_2 |SND_JACK_BTN_3 , jack, + pins, num_pins);if (ret) {dev_err (card->dev,"Headset Jack creation failed: %d\n" , ret);return ret;
@@ -220,6 +235,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->platforms = platform; dl->num_platforms =1 ; dl->id =0 ; + dl->dai_fmt =SND_SOC_DAIFMT_I2S |SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_CBC_CFC ; dl->init = avs_rt5682_codec_init; dl->exit = avs_rt5682_codec_exit; dl->be_hw_params_fixup = avs_rt5682_be_fixup;
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH 8/8 ASoC: Intel: avs: rt5682: Tidy up hw_params()
In reply to Cezary RojewskiTo improve readability, reword several local variables to better match their counterparts in declarations of soc-dai.h. For similar reasons, wording for few comments is streamlined while redundant comments are removed.
No functional changes.
--- sound/soc/intel/avs/boards/rt5682.c | 35 +++++++++++++---------------- 1 file changed, 16 insertions(+), 19 deletions(-)
sound/soc/intel/avs/boards/rt5682.c +16 -19
@@ -145,39 +145,36 @@ avs_rt5682_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_para {struct snd_soc_pcm_runtime *runtime =asoc_substream_to_rtd (substream);struct snd_soc_dai *codec_dai =asoc_rtd_to_codec (runtime,0 ); -int clk_id, clk_freq; -int pll_out, ret; +int pll_source, freq_in, freq_out; +int ret;if (avs_rt5682_quirk &AVS_RT5682_MCLK_EN ) { - clk_id =RT5682_PLL1_S_MCLK ; + pll_source =RT5682_PLL1_S_MCLK ;if (avs_rt5682_quirk &AVS_RT5682_MCLK_24MHZ ) - clk_freq =24000000 ; + freq_in =24000000 ;else - clk_freq =19200000 ; + freq_in =19200000 ; }else { - clk_id =RT5682_PLL1_S_BCLK1 ; - clk_freq =params_rate (params) *50 ; + pll_source =RT5682_PLL1_S_BCLK1 ; + freq_in =params_rate (params) *50 ; } - pll_out =params_rate (params) *512 ; + freq_out =params_rate (params) *512 ; - ret =snd_soc_dai_set_pll (codec_dai,0 , clk_id, clk_freq, pll_out); + ret =snd_soc_dai_set_pll (codec_dai,RT5682_PLL1 , pll_source, freq_in, freq_out);if (ret <0 ) -dev_err (runtime->dev,"snd_soc_dai_set_pll err = %d\n" , ret); +dev_err (runtime->dev,"Set PLL failed: %d\n" , ret); -/* Configure sysclk for codec */ - ret =snd_soc_dai_set_sysclk (codec_dai,RT5682_SCLK_S_PLL1 , pll_out,SND_SOC_CLOCK_IN ); + ret =snd_soc_dai_set_sysclk (codec_dai,RT5682_SCLK_S_PLL1 , freq_out,SND_SOC_CLOCK_IN );if (ret <0 ) -dev_err (runtime->dev,"snd_soc_dai_set_sysclk err = %d\n" , ret); +dev_err (runtime->dev,"Set sysclk failed: %d\n" , ret); -/* slot_width should equal or large than data length, set them be the same */ +/* slot_width should be equal or larger than data length. */ ret =snd_soc_dai_set_tdm_slot (codec_dai,0x0 ,0x0 ,2 ,params_width (params)); -if (ret <0 ) { -dev_err (runtime->dev,"set TDM slot err:%d\n" , ret); -return ret; - } +if (ret <0 ) +dev_err (runtime->dev,"Set TDM slot failed: %d\n" , ret); -return 0 ; +return ret; }static const struct snd_soc_ops avs_rt5682_ops = {
Signature · 1 line
2.25.1
Mark Brown
maintainerQuoted 9 lines · Cezary Rojewski
Series adds support for two boards: es8336 and rt5663. The former is utilized by some KBL-based tablets whereas the latter unlocks Chromebooks with rt5663 i2c codecs.
As existing implementation of es8336 (
es8316.c) codec driver is not prepared to cope with KBL-based platforms, couple of small, clock-related changes precede anything avs-driver related.[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/8] ASoC: codecs: es8316: Add support for 24 MHz MCLK
commit: be7dc10ab0bc247c2abbdefdaa9d5196df88e9d1
[2/8] ASoC: codecs: es8316: Add support for S24_3LE format
commit: c30d10aeb398cf71662cb8c6b0090ed9ab38dd8e
[3/8] ASoC: Intel: avs: Add es8336 machine board
commit: 32e40c8d6ff920354fde36299198c80e7a7d3b76
[4/8] ASoC: Intel: avs: Load es8336 board on KBL-based platforms
commit: d55bb0f1c1a365c42d8b4032cb965a255692a400
[5/8] ASoC: Intel: avs: Add rt5663 machine board
commit: 05c5d4e326cc41221a9c065c1e6fee4cdca549b1
[6/8] ASoC: Intel: avs: Load rt5663 board on KBL-based platforms
commit: 3ed180ac3cec77fe193573adcbaaca34bbc63551
[7/8] ASoC: Intel: avs: rt5682: Add missing components
commit: 27cd41698de49c8afbcc148a0d76c35da3271519
[8/8] ASoC: Intel: avs: rt5682: Tidy up hw_params()
commit: 7012fa7d56b7b3e100e4ff0c8d8d7a183f09130dAll 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