May 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: Intel: sof-rt5682: fix undefined references with Baytrail-only support
by Pierre-Louis Bossart 29 May '19

29 May '19

The sof-rt5682 machine driver supports both legacy Baytrail devices and more recent ApolloLake/CometLake platforms. When only Baytrail is selected, the compilation fails with the following errors: ERROR: "hdac_hdmi_jack_port_init" [sound/soc/intel/boards/snd-soc-sof_rt5682.ko] undefined! ERROR: "hdac_hdmi_jack_init" [sound/soc/intel/boards/snd-soc-sof_rt5682.ko] undefined! Fix by selecting SND_SOC_HDAC_HDMI unconditionally. The code for HDMI support is not reachable on Baytrail so this change has no functional impact. Fixes: f70abd75b7c6 ("ASoC: Intel: add sof-rt5682 machine driver") Reported-by: kbuild test robot <lkp(a)intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/intel/boards/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index 59e366edc16b..317ee1e8c8c6 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -402,7 +402,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH (SND_SOC_SOF_BAYTRAIL && X86_INTEL_LPSS) select SND_SOC_RT5682 select SND_SOC_DMIC - select SND_SOC_HDAC_HDMI if SND_SOC_SOF_HDA_COMMON + select SND_SOC_HDAC_HDMI help This adds support for ASoC machine driver for SOF platforms with rt5682 codec. -- 2.20.1

2 1

[alsa-devel] [PATCH] ASoC: cs42xx8: Fix build error with CONFIG_GPIOLIB is not set
by shengjiu.wang＠nxp.com 29 May '19

29 May '19

From: Shengjiu Wang <shengjiu.wang(a)nxp.com> config: x86_64-randconfig-x000201921-201921 compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: make ARCH=x86_64 sound/soc/codecs/cs42xx8.c: In function ‘cs42xx8_probe’: sound/soc/codecs/cs42xx8.c:472:25: error: implicit declaration of function ‘devm_gpiod_get_optional’; did you mean ‘devm_clk_get_optional’? [-Werror=implicit-function-declaration] cs42xx8->gpiod_reset = devm_gpiod_get_optional(dev, "reset", ^~~~~~~~~~~~~~~~~~~~~~~ devm_clk_get_optional sound/soc/codecs/cs42xx8.c:473:8: error: ‘GPIOD_OUT_HIGH’ undeclared (first use in this function); did you mean ‘GPIOF_INIT_HIGH’? GPIOD_OUT_HIGH); ^~~~~~~~~~~~~~ GPIOF_INIT_HIGH sound/soc/codecs/cs42xx8.c:473:8: note: each undeclared identifier is reported only once for each function it appears in sound/soc/codecs/cs42xx8.c:477:2: error: implicit declaration of function ‘gpiod_set_value_cansleep’; did you mean ‘gpio_set_value_cansleep’? [-Werror=implicit-function-declaration] gpiod_set_value_cansleep(cs42xx8->gpiod_reset, 0); ^~~~~~~~~~~~~~~~~~~~~~~~ gpio_set_value_cansleep Fixes: bfe95dfa4dac ("ASoC: cs42xx8: Add reset gpio handling") Reported-by: kbuild test robot <lkp(a)intel.com> Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/codecs/cs42xx8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c index 3e8dbf63adbe..3bbc62322dfe 100644 --- a/sound/soc/codecs/cs42xx8.c +++ b/sound/soc/codecs/cs42xx8.c @@ -14,7 +14,7 @@ #include <linux/delay.h> #include <linux/module.h> #include <linux/of_device.h> -#include <linux/of_gpio.h> +#include <linux/gpio/consumer.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> #include <sound/pcm_params.h> -- 2.21.0

2 1

[alsa-devel] [PATCH] ASoC: core: use component driver name as component name
by Tzung-Bi Shih 29 May '19

29 May '19

fmt_single_name() uses device name to determine component name. If multiple components bind to the same device, the debugfs creation in soc_init_component_debugfs() would fail due to duplicated entity names. Name provided by component driver is unique enough to represent each component. Use component driver name as the component name to avoid name duplication. Signed-off-by: Tzung-Bi Shih <tzungbi(a)google.com> --- Hi, We got "Failed to create component debugfs directory" in our environment. But the patch does not resolve the issue. (https://mailman.alsa-project.org/pipermail/alsa-devel/2018-February/132391.…) The entity name duplicated when creating the debugfs directory, because there is a device registered 2 components in mt8183_afe_pcm_dev_probe() in sound/soc/mediatek/mt8183/mt8183-afe-pcm.c. sound/soc/soc-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 7abb017a83f3..2d3520fca613 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3113,7 +3113,10 @@ static int snd_soc_component_initialize(struct snd_soc_component *component, { struct snd_soc_dapm_context *dapm; - component->name = fmt_single_name(dev, &component->id); + if (driver->name) + component->name = kstrdup(driver->name, GFP_KERNEL); + else + component->name = fmt_single_name(dev, &component->id); if (!component->name) { dev_err(dev, "ASoC: Failed to allocate name\n"); return -ENOMEM; -- 2.22.0.rc1.257.g3120a18244-goog

2 1

[alsa-devel] [PATCH 000/145] ASoC: modern dai_link style support
by Kuninori Morimoto 29 May '19

29 May '19

Hi Mark These are for modern dai_link style support patches. [001/145] adds missing modern dai_link style for CPU. and others are switch to modern style from legacy style. Last patch removes legacy style. These are based on mark/for-5.3 + v5.2-rc1 I hope these work well for all sound card, but I can't test for all. Please test these at each sound cards. Kuninori Morimoto (145): ASoC: soc-core: use snd_soc_dai_link_component for CPU ASoC: simple-card: support snd_soc_dai_link_component style for cpu ASoC: soc.h: add sound dai_link connection macro ASoC: mediatek: mt6797-mt6351: use modern dai_link style ASoC: mediatek: mt2701-wm8960: use modern dai_link style ASoC: mediatek: mt2701-cs42448: use modern dai_link style ASoC: mediatek: mt8173-max98090: use modern dai_link style ASoC: mediatek: mt8173-rt5650: use modern dai_link style ASoC: mediatek: mt8173-rt5650-rt5676: use modern dai_link style ASoC: mediatek: mt8173-rt5650-rt5514: use modern dai_link style ASoC: mediatek: mt8183-da7219-max98357: use modern dai_link style ASoC: mediatek: mt8183-mt6358-ts3a227-max98357: use modern dai_link style ASoC: samsung: bells: use modern dai_link style ASoC: samsung: smdk_wm8580: use modern dai_link style ASoC: samsung: smdk_wm8994: use modern dai_link style ASoC: samsung: smdk_wm8994pcm: use modern dai_link style ASoC: samsung: smdk_spdif: use modern dai_link style ASoC: samsung: h1940_uda1380: use modern dai_link style ASoC: samsung: arndale_rt5631: use modern dai_link style ASoC: samsung: tobermory: use modern dai_link style ASoC: samsung: tm2_wm5110: use modern dai_link style ASoC: samsung: speyside: use modern dai_link style ASoC: samsung: snow: use modern dai_link style ASoC: samsung: smartq_wm8987: use modern dai_link style ASoC: samsung: s3c24xx_uda134x: use modern dai_link style ASoC: samsung: s3c24xx_simtec_tlv320aic23: use modern dai_link style ASoC: samsung: s3c24xx_simtec_hermes: use modern dai_link style ASoC: samsung: rx1950_uda1380: use modern dai_link style ASoC: samsung: odroid: use modern dai_link style ASoC: samsung: neo1973_wm8753: use modern dai_link style ASoC: samsung: lowland: use modern dai_link style ASoC: samsung: littlemill: use modern dai_link style ASoC: samsung: jive_wm8750: use modern dai_link style ASoC: pxa: brownstone: use modern dai_link style ASoC: pxa: corgi: use modern dai_link style ASoC: pxa: e740_wm9705: use modern dai_link style ASoC: pxa: e750_wm9705: use modern dai_link style ASoC: pxa: e800_wm9712: use modern dai_link style ASoC: pxa: em-x270: use modern dai_link style ASoC: pxa: hx4700: use modern dai_link style ASoC: pxa: imote2: use modern dai_link style ASoC: pxa: magician: use modern dai_link style ASoC: pxa: mioa701_wm9713: use modern dai_link style ASoC: pxa: palm27x: use modern dai_link style ASoC: pxa: zylonite: use modern dai_link style ASoC: pxa: z2: use modern dai_link style ASoC: pxa: ttc-dkb: use modern dai_link style ASoC: pxa: tosa: use modern dai_link style ASoC: pxa: spitz: use modern dai_link style ASoC: pxa: poodle: use modern dai_link style ASoC: kirkwood: armada-370-db: use modern dai_link style ASoC: ti: n810: use modern dai_link style ASoC: ti: osk5912: use modern dai_link style ASoC: ti: ams-delta: use modern dai_link style ASoC: ti: omap3pandora: use modern dai_link style ASoC: ti: davinci-evm: use modern dai_link style ASoC: ti: omap-hdmi: use modern dai_link style ASoC: ti: omap-abe-twl6040: use modern dai_link style ASoC: ti: omap-twl4030: use modern dai_link style ASoC: ti: rx51: use modern dai_link style ASoC: sh: migor: use modern dai_link style ASoC: sh: sh7760-ac97: use modern dai_link style ASoC: amd: acp-da7219-max98357a: use modern dai_link style ASoC: amd: acp-rt5645: use modern dai_link style ASoC: atmel: mikroe-proto: use modern dai_link style ASoC: atmel: sam9x5_wm8731: use modern dai_link style ASoC: atmel: sam9g20_wm8731: use modern dai_link style ASoC: atmel: tse850-pcm5142: use modern dai_link style ASoC: atmel: atmel-wm8904: use modern dai_link style ASoC: atmel: atmel-pdmic: use modern dai_link style ASoC: atmel: atmel-classd: use modern dai_link style ASoC: au1x: db1000: use modern dai_link style ASoC: au1x: db1200: use modern dai_link style ASoC: cirrus: edb93xx: use modern dai_link style ASoC: cirrus: simone: use modern dai_link style ASoC: cirrus: snappercl15: use modern dai_link style ASoC: fsl: efika-audio-fabric: use modern dai_link style ASoC: fsl: imx-spdif: use modern dai_link style ASoC: fsl: mx27vis-aic32x4: use modern dai_link style ASoC: fsl: phycore-ac97: use modern dai_link style ASoC: fsl: wm1133-ev1: use modern dai_link style ASoC: fsl: fsl-asoc-card: use modern dai_link style ASoC: fsl: mpc8610_hpcd/p1022_ds/p1022_rdk: use modern dai_link style ASoC: fsl: imx-es8328: use modern dai_link style ASoC: fsl: eukrea-tlv320: use modern dai_link style ASoC: fsl: imx-sgtl5000: use modern dai_link style ASoC: fsl: imx-mc13783: use modern dai_link style ASoC: fsl: pcm030-audio-fabric: use modern dai_link style ASoC: fsl: imx-audmix: use modern dai_link style ASoC: jz4740: qi_lb60: use modern dai_link style ASoC: meson: axg-card: use modern dai_link style ASoC: mxs: mxs-sgtl5000: use modern dai_link style ASoC: nuc900: nuc900-audio: use modern dai_link style ASoC: qcom: storm: use modern dai_link style ASoC: qcom: common: use modern dai_link style ASoC: qcom: apq8016_sbc: use modern dai_link style ASoC: rockchip: rk3399_gru_sound: use modern dai_link style ASoC: rockchip: rk3288_hdmi_analog: use modern dai_link style ASoC: rockchip: rockchip_rt5645: use modern dai_link style ASoC: rockchip: rockchip_max98090: use modern dai_link style ASoC: sirf: sirf-audio: use modern dai_link style ASoC: ux500: mop500: use modern dai_link style ASoC: sunxi: sun4i-codec: use modern dai_link style ASoC: txx9: txx9aclc-generic: use modern dai_link style ASoC: tegra: tegra_rt5677: use modern dai_link style ASoC: tegra: tegra_wm8753: use modern dai_link style ASoC: tegra: trimslice: use modern dai_link style ASoC: tegra: tegra_alc5632: use modern dai_link style ASoC: tegra: tegra_sgtl5000: use modern dai_link style ASoC: tegra: tegra_rt5640: use modern dai_link style ASoC: tegra: tegra_wm8903: use modern dai_link style ASoC: tegra: tegra_wm9712: use modern dai_link style ASoC: tegra: tegra_max98090: use modern dai_link style ASoC: soc-topology: use modern dai_link style ASoC: vc4: vc4_htmi: use modern dai_link style ASoC: sof: use modern dai_link style ASoC: Intel: bdw-rt5677: use modern dai_link style ASoC: Intel: haswell: use modern dai_link style ASoC: Intel: broadwell: use modern dai_link style ASoC: Intel: bxt_da7219_max98357a: use modern dai_link style ASoC: Intel: bxt_rt298: use modern dai_link style ASoC: Intel: byt-rt5640: use modern dai_link style ASoC: Intel: byt-max98090: use modern dai_link style ASoC: Intel: bytcht_es8316: use modern dai_link style ASoC: Intel: bytcht_nocodec: use modern dai_link style ASoC: Intel: bytcht_da7213: use modern dai_link style ASoC: Intel: bytcr_rt5651: use modern dai_link style ASoC: Intel: bytcr_rt5640: use modern dai_link style ASoC: Intel: cht_bsw_rt5645: use modern dai_link style ASoC: Intel: cht_bsw_max98090_ti: use modern dai_link style ASoC: Intel: cht_bsw_rt5672: use modern dai_link style ASoC: Intel: cht_bsw_nau8824: use modern dai_link style ASoC: Intel: kbl_rt5660: use modern dai_link style ASoC: Intel: kbl_rt5663_max98927: use modern dai_link style ASoC: Intel: kbl_rt5663_rt5514_max98927: use modern dai_link style ASoC: Intel: kbl_da7219_max98927: use modern dai_link style ASoC: Intel: kbl_da7219_max98357a: use modern dai_link style ASoC: Intel: skl_nau88l25_ssm4567: use modern dai_link style ASoC: Intel: skl_rt286: use modern dai_link style ASoC: Intel: skl_nau88l25_max98357a: use modern dai_link style ASoC: Intel: skl-pcm: use modern dai_link style ASoC: Intel: skl_hda_dsp_common: use modern dai_link style ASoC: Intel: glk_rt5682_max98357a: use modern dai_link style ASoC: Intel: sof_rt5682: use modern dai_link style ASoC: soc-core: remove legacy style dai_link drivers/gpu/drm/vc4/vc4_hdmi.c | 19 +- include/sound/simple_card_utils.h | 20 +- include/sound/soc.h | 153 +++++++++------ sound/soc/amd/acp-da7219-max98357a.c | 42 ++-- sound/soc/amd/acp-rt5645.c | 21 +- sound/soc/atmel/atmel-classd.c | 21 +- sound/soc/atmel/atmel-pdmic.c | 21 +- sound/soc/atmel/atmel_wm8904.c | 17 +- sound/soc/atmel/mikroe-proto.c | 21 +- sound/soc/atmel/sam9g20_wm8731.c | 22 ++- sound/soc/atmel/sam9x5_wm8731.c | 20 +- sound/soc/atmel/tse850-pcm5142.c | 13 +- sound/soc/au1x/db1000.c | 10 +- sound/soc/au1x/db1200.c | 50 +++-- sound/soc/cirrus/edb93xx.c | 10 +- sound/soc/cirrus/simone.c | 10 +- sound/soc/cirrus/snappercl15.c | 11 +- sound/soc/fsl/efika-audio-fabric.c | 22 ++- sound/soc/fsl/eukrea-tlv320.c | 19 +- sound/soc/fsl/fsl-asoc-card.c | 47 +++-- sound/soc/fsl/fsl_utils.c | 2 +- sound/soc/fsl/imx-audmix.c | 45 ++++- sound/soc/fsl/imx-es8328.c | 23 ++- sound/soc/fsl/imx-mc13783.c | 10 +- sound/soc/fsl/imx-sgtl5000.c | 23 ++- sound/soc/fsl/imx-spdif.c | 20 +- sound/soc/fsl/mpc8610_hpcd.c | 33 +++- sound/soc/fsl/mx27vis-aic32x4.c | 11 +- sound/soc/fsl/p1022_ds.c | 36 +++- sound/soc/fsl/p1022_rdk.c | 35 +++- sound/soc/fsl/pcm030-audio-fabric.c | 20 +- sound/soc/fsl/phycore-ac97.c | 10 +- sound/soc/fsl/wm1133-ev1.c | 10 +- sound/soc/generic/audio-graph-card.c | 30 +-- sound/soc/generic/simple-card-utils.c | 21 +- sound/soc/generic/simple-card.c | 39 ++-- sound/soc/intel/boards/bdw-rt5677.c | 22 ++- sound/soc/intel/boards/broadwell.c | 46 +++-- sound/soc/intel/boards/bxt_da7219_max98357a.c | 140 ++++++++------ sound/soc/intel/boards/bxt_rt298.c | 129 +++++++------ sound/soc/intel/boards/byt-max98090.c | 10 +- sound/soc/intel/boards/byt-rt5640.c | 10 +- sound/soc/intel/boards/bytcht_da7213.c | 37 ++-- sound/soc/intel/boards/bytcht_es8316.c | 38 ++-- sound/soc/intel/boards/bytcht_nocodec.c | 30 +-- sound/soc/intel/boards/bytcr_rt5640.c | 43 +++-- sound/soc/intel/boards/bytcr_rt5651.c | 40 ++-- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 32 ++-- sound/soc/intel/boards/cht_bsw_nau8824.c | 41 ++-- sound/soc/intel/boards/cht_bsw_rt5645.c | 42 ++-- sound/soc/intel/boards/cht_bsw_rt5672.c | 37 ++-- sound/soc/intel/boards/glk_rt5682_max98357a.c | 137 +++++++------ sound/soc/intel/boards/haswell.c | 46 +++-- sound/soc/intel/boards/kbl_da7219_max98357a.c | 114 ++++++----- sound/soc/intel/boards/kbl_da7219_max98927.c | 212 +++++++++------------ sound/soc/intel/boards/kbl_rt5660.c | 83 ++++---- sound/soc/intel/boards/kbl_rt5663_max98927.c | 185 +++++++++--------- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 126 ++++++------ sound/soc/intel/boards/skl_hda_dsp_common.c | 66 ++++--- sound/soc/intel/boards/skl_hda_dsp_generic.c | 4 +- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 120 +++++++----- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 132 +++++++------ sound/soc/intel/boards/skl_rt286.c | 118 ++++++------ sound/soc/intel/boards/sof_rt5682.c | 37 ++-- sound/soc/intel/skylake/skl-pcm.c | 2 +- sound/soc/jz4740/qi_lb60.c | 10 +- sound/soc/kirkwood/armada-370-db.c | 42 ++-- sound/soc/mediatek/mt2701/mt2701-cs42448.c | 95 ++++++--- sound/soc/mediatek/mt2701/mt2701-wm8960.c | 34 ++-- sound/soc/mediatek/mt6797/mt6797-mt6351.c | 115 +++++++---- sound/soc/mediatek/mt8173/mt8173-max98090.c | 34 ++-- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 51 ++--- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 85 +++++---- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 74 +++---- sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 182 ++++++++++-------- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 168 ++++++++++------ sound/soc/meson/axg-card.c | 57 ++++-- sound/soc/mxs/mxs-sgtl5000.c | 27 ++- sound/soc/nuc900/nuc900-audio.c | 10 +- sound/soc/pxa/brownstone.c | 10 +- sound/soc/pxa/corgi.c | 10 +- sound/soc/pxa/e740_wm9705.c | 20 +- sound/soc/pxa/e750_wm9705.c | 20 +- sound/soc/pxa/e800_wm9712.c | 21 +- sound/soc/pxa/em-x270.c | 20 +- sound/soc/pxa/hx4700.c | 10 +- sound/soc/pxa/imote2.c | 11 +- sound/soc/pxa/magician.c | 22 ++- sound/soc/pxa/mioa701_wm9713.c | 20 +- sound/soc/pxa/palm27x.c | 20 +- sound/soc/pxa/poodle.c | 10 +- sound/soc/pxa/spitz.c | 10 +- sound/soc/pxa/tosa.c | 20 +- sound/soc/pxa/ttc-dkb.c | 10 +- sound/soc/pxa/z2.c | 10 +- sound/soc/pxa/zylonite.c | 30 +-- sound/soc/qcom/apq8016_sbc.c | 19 +- sound/soc/qcom/common.c | 33 +++- sound/soc/qcom/storm.c | 17 +- sound/soc/rockchip/rk3288_hdmi_analog.c | 21 +- sound/soc/rockchip/rk3399_gru_sound.c | 51 +++-- sound/soc/rockchip/rockchip_max98090.c | 17 +- sound/soc/rockchip/rockchip_rt5645.c | 33 ++-- sound/soc/samsung/arndale_rt5631.c | 25 ++- sound/soc/samsung/bells.c | 87 +++++---- sound/soc/samsung/h1940_uda1380.c | 10 +- sound/soc/samsung/jive_wm8750.c | 10 +- sound/soc/samsung/littlemill.c | 19 +- sound/soc/samsung/lowland.c | 26 ++- sound/soc/samsung/neo1973_wm8753.c | 18 +- sound/soc/samsung/odroid.c | 29 ++- sound/soc/samsung/rx1950_uda1380.c | 11 +- sound/soc/samsung/s3c24xx_simtec_hermes.c | 11 +- sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 11 +- sound/soc/samsung/s3c24xx_uda134x.c | 10 +- sound/soc/samsung/smartq_wm8987.c | 10 +- sound/soc/samsung/smdk_spdif.c | 10 +- sound/soc/samsung/smdk_wm8580.c | 20 +- sound/soc/samsung/smdk_wm8994.c | 30 +-- sound/soc/samsung/smdk_wm8994pcm.c | 10 +- sound/soc/samsung/snow.c | 40 ++-- sound/soc/samsung/speyside.c | 26 ++- sound/soc/samsung/tm2_wm5110.c | 42 ++-- sound/soc/samsung/tobermory.c | 10 +- sound/soc/sh/migor.c | 10 +- sound/soc/sh/sh7760-ac97.c | 11 +- sound/soc/sirf/sirf-audio.c | 13 +- sound/soc/soc-core.c | 149 +++------------ sound/soc/soc-topology.c | 22 ++- sound/soc/sof/nocodec.c | 21 +- sound/soc/sof/topology.c | 20 +- sound/soc/sunxi/sun4i-codec.c | 20 +- sound/soc/tegra/tegra_alc5632.c | 37 ++-- sound/soc/tegra/tegra_max98090.c | 17 +- sound/soc/tegra/tegra_rt5640.c | 17 +- sound/soc/tegra/tegra_rt5677.c | 37 ++-- sound/soc/tegra/tegra_sgtl5000.c | 37 ++-- sound/soc/tegra/tegra_wm8753.c | 17 +- sound/soc/tegra/tegra_wm8903.c | 17 +- sound/soc/tegra/tegra_wm9712.c | 14 +- sound/soc/tegra/trimslice.c | 19 +- sound/soc/ti/ams-delta.c | 10 +- sound/soc/ti/davinci-evm.c | 105 ++++++---- sound/soc/ti/n810.c | 11 +- sound/soc/ti/omap-abe-twl6040.c | 36 +++- sound/soc/ti/omap-hdmi.c | 20 +- sound/soc/ti/omap-twl4030.c | 36 ++-- sound/soc/ti/omap3pandora.c | 20 +- sound/soc/ti/osk5912.c | 11 +- sound/soc/ti/rx51.c | 23 ++- sound/soc/txx9/txx9aclc-generic.c | 10 +- sound/soc/ux500/mop500.c | 36 ++-- 152 files changed, 3382 insertions(+), 2344 deletions(-) -- 2.7.4

3 149

[alsa-devel] [PATCH 1/6] device property: Add new array helper
by Charles Keepax 29 May '19

29 May '19

It is fairly common to want to read an integer array property that is composed of an unknown number of fixed size integer groups. For example, say each group consists of three values which correspond to the settings for one input on the device and the driver supports several chips with different numbers of inputs. Add a new helper function to provide this functionality, it differs for the existing helpers in that it allows reading a smaller number of values than the full array size and checks that the number of values read is a multiple of the group size. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- drivers/base/property.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/property.h | 2 ++ 2 files changed, 50 insertions(+) diff --git a/drivers/base/property.c b/drivers/base/property.c index 348b37e64944c..656d21e01a648 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -133,6 +133,54 @@ int device_property_read_u32_array(struct device *dev, const char *propname, EXPORT_SYMBOL_GPL(device_property_read_u32_array); /** + * device_property_read_u32_2darray - return a 2d u32 array property of a device + * @dev: Device to get the property of + * @propname: Name of the property + * @val: The values are stored here or %NULL to return the number of values + * @nval: Size of the @val array + * @multiple: Number of entries in each block of data + * + * Function reads an array of u32 properties split up into fixed size + * sub-groups, with @propname from the device firmware description and + * stores them to @val if found. + * + * Return: Number of values read + * %0 if the property was not found, + * %-EINVAL if given arguments are not valid, + * %-ENODATA if the property does not have a value, + * %-EPROTO if the property is not an array of numbers, + * %-EOVERFLOW if the size of the property is not as expected. + * %-ENXIO if no suitable firmware interface is present. + */ +int device_property_read_u32_2darray(struct device *dev, const char *propname, + u32 *val, size_t nval, int multiple) +{ + int n, ret; + + n = device_property_read_u32_array(dev, propname, NULL, 0); + if (n == -EINVAL) { + return 0; /* missing, ignore */ + } else if (n < 0) { + dev_warn(dev, "%s malformed (%d)\n", propname, n); + return n; + } else if ((n % multiple) != 0) { + dev_warn(dev, "%s not a multiple of %d entries\n", + propname, multiple); + return -EOVERFLOW; + } + + if (n > nval) + n = nval; + + ret = device_property_read_u32_array(dev, propname, val, n); + if (ret < 0) + return ret; + else + return n; +} +EXPORT_SYMBOL_GPL(device_property_read_u32_2darray); + +/** * device_property_read_u64_array - return a u64 array property of a device * @dev: Device to get the property of * @propname: Name of the property diff --git a/include/linux/property.h b/include/linux/property.h index a29369c89e6ef..854867f0d139f 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -43,6 +43,8 @@ int device_property_read_u16_array(struct device *dev, const char *propname, u16 *val, size_t nval); int device_property_read_u32_array(struct device *dev, const char *propname, u32 *val, size_t nval); +int device_property_read_u32_2darray(struct device *dev, const char *propname, + u32 *val, size_t nval, int multiple); int device_property_read_u64_array(struct device *dev, const char *propname, u64 *val, size_t nval); int device_property_read_string_array(struct device *dev, const char *propname, -- 2.11.0

1 5

Re: [alsa-devel] Dell XPS 9360 continuous hissing sound
by Paulo Fidalgo 29 May '19

29 May '19

Since I don't know if you are waiting for the command output or not I will provide it: After a reboot with the headset unplugged: amixer -c0 cget numid=10 numid=10,iface=MIXER,name='Headphone Mic Boost Volume' ; type=INTEGER,access=rw---R--,values=2,min=0,max=3,step=0 : values=0,0 | dBscale-min=0.00dB,step=10.00dB,mute=0 After a reboot with the headset plugged I have the same value: amixer -c0 cget numid=10 numid=10,iface=MIXER,name='Headphone Mic Boost Volume' ; type=INTEGER,access=rw---R--,values=2,min=0,max=3,step=0 : values=0,0 | dBscale-min=0.00dB,step=10.00dB,mute=0 Also when the headset is plugged the mic, seems to not be detected, as it keeps with the internal mic of the laptop, but I will create another thread for that. Kind regards, Paulo Fidalgo On Thu, 16 May 2019 at 15:45, Paulo Fidalgo <paulo.fidalgo.pt(a)gmail.com> wrote: > > Since I don't know if you are waiting for the command output or not I > will provide it: > > After a reboot with the headset unplugged: > > amixer -c0 cget numid=10 > numid=10,iface=MIXER,name='Headphone Mic Boost Volume' > ; type=INTEGER,access=rw---R--,values=2,min=0,max=3,step=0 > : values=0,0 > | dBscale-min=0.00dB,step=10.00dB,mute=0 > > After a reboot with the headset plugged I have the same value: > > amixer -c0 cget numid=10 > numid=10,iface=MIXER,name='Headphone Mic Boost Volume' > ; type=INTEGER,access=rw---R--,values=2,min=0,max=3,step=0 > : values=0,0 > | dBscale-min=0.00dB,step=10.00dB,mute=0 > > > Also when the headset is plugged the mic, seems to not be detected, as > it keeps with the internal mic of the laptop, but I will create > another thread for that. > > Kind regards, > > Paulo Fidalgo > > > On Fri, 22 Mar 2019 at 16:54, Takashi Iwai <tiwai(a)suse.de> wrote: > > > > On Fri, 22 Mar 2019 17:07:15 +0100, > > Paulo Fidalgo wrote: > > > > > > Strangely the command returns amixer: Unable to find simple control 'numid=10',0 > > > So I've runned "amixer -c0" and you can find the output in before.txt > > > > Ah sorry, it was a typo: use "cget" instead of "get". > > > > > > > Then I've runned amixer -c 0 cset 'numid=10' 1 > > > and again the "amixer -c0" and you can find the output in after.txt > > > > > > Also I've notice that the sound appears after I playing a music on > > > computer and goes a few (like 10 ) seconds after the music stopped. > > > > It sounds like a state after runtime PM. > > > > > > Takashi > > > > > > > > On Fri, 22 Mar 2019 at 15:37, Takashi Iwai <tiwai(a)suse.de> wrote: > > > > > > > > On Fri, 22 Mar 2019 12:40:22 +0100, > > > > Paulo Fidalgo wrote: > > > > > > > > > > Hi! > > > > > > > > > > After a bug report on Fedora > > > > > (https://bugzilla.redhat.com/show_bug.cgi?id=1677353) > > > > > > > > > > ---- > > > > > When I start t he computer I hears a continuous background noise. The > > > > > problem is also described here: > > > > > https://wiki.archlinux.org/index.php/Dell_XPS_13_(9360)#Continuous_hissing_… > > > > > > > > > > I need to issue the command `amixer -c 0 cset 'numid=10' 1` to solve > > > > > the problem, but every time I reboot the computer I need to run it > > > > > again. > > > > > This has been happening for quite some time, but I've been post-poning > > > > > the bug report. > > > > > > > > What is the original value before setting this amixer command above? > > > > You can get via "amixer -c0 get numid=10'. > > > > > > > > Does the noise again when you restore the value after setting to 1 in > > > > the above? > > > > > > > > > > > > Takashi > > > > > > > > > > > > > > Current kernel: 4.20.7-200.fc29.x86_64 > > > > > > > > > > Alsa information: > > > > > http://www.alsa-project.org/db/?f=df4834c53335709abb521c767e7b1da2f4371744 > > > > > ---- > > > > > They advise me to contact you, to see if we can get a solution on this. > > > > > > > > > > Note: The computer also does not recognise (switch to) when I plug an headset. > > > > > > > > > > If you need more information, I'm eager to help diagnose and help to > > > > > solve this, but I have no Kernel programming skills, other than that > > > > > count on me. > > > > > > > > > > Kind regards, > > > > > > > > > > Paulo Fidalgo > > > > > > > > Simple mixer control 'Master',0 > > > Capabilities: pvolume pvolume-joined pswitch pswitch-joined > > > Playback channels: Mono > > > Limits: Playback 0 - 87 > > > Mono: Playback 87 [100%] [0.00dB] [on] > > > Simple mixer control 'Headphone',0 > > > Capabilities: pvolume pswitch > > > Playback channels: Front Left - Front Right > > > Limits: Playback 0 - 87 > > > Mono: > > > Front Left: Playback 87 [100%] [0.00dB] [on] > > > Front Right: Playback 87 [100%] [0.00dB] [on] > > > Simple mixer control 'Headphone Mic',0 > > > Capabilities: cswitch cswitch-joined cswitch-exclusive > > > Capture exclusive group: 0 > > > Capture channels: Mono > > > Mono: Capture [off] > > > Simple mixer control 'Headphone Mic Boost',0 > > > Capabilities: volume > > > Playback channels: Front Left - Front Right > > > Capture channels: Front Left - Front Right > > > Limits: 0 - 3 > > > Front Left: 1 [33%] [10.00dB] > > > Front Right: 1 [33%] [10.00dB] > > > Simple mixer control 'Speaker',0 > > > Capabilities: pvolume pswitch > > > Playback channels: Front Left - Front Right > > > Limits: Playback 0 - 87 > > > Mono: > > > Front Left: Playback 0 [0%] [-65.25dB] [off] > > > Front Right: Playback 0 [0%] [-65.25dB] [off] > > > Simple mixer control 'PCM',0 > > > Capabilities: pvolume > > > Playback channels: Front Left - Front Right > > > Limits: Playback 0 - 255 > > > Mono: > > > Front Left: Playback 255 [100%] [0.00dB] > > > Front Right: Playback 255 [100%] [0.00dB] > > > Simple mixer control 'IEC958',0 > > > Capabilities: pswitch pswitch-joined > > > Playback channels: Mono > > > Mono: Playback [off] > > > Simple mixer control 'IEC958',1 > > > Capabilities: pswitch pswitch-joined > > > Playback channels: Mono > > > Mono: Playback [on] > > > Simple mixer control 'IEC958',2 > > > Capabilities: pswitch pswitch-joined > > > Playback channels: Mono > > > Mono: Playback [on] > > > Simple mixer control 'IEC958',3 > > > Capabilities: pswitch pswitch-joined > > > Playback channels: Mono > > > Mono: Playback [on] > > > Simple mixer control 'IEC958',4 > > > Capabilities: pswitch pswitch-joined > > > Playback channels: Mono > > > Mono: Playback [on] > > > Simple mixer control 'Capture',0 > > > Capabilities: cvolume cswitch > > > Capture channels: Front Left - Front Right > > > Limits: Capture 0 - 63 > > > Front Left: Capture 63 [100%] [30.00dB] [on] > > > Front Right: Capture 63 [100%] [30.00dB] [on] > > > Simple mixer control 'Auto-Mute Mode',0 > > > Capabilities: enum > > > Items: 'Disabled' 'Enabled' > > > Item0: 'Disabled' > > > Simple mixer control 'Headset Mic',0 > > > Capabilities: cswitch cswitch-joined cswitch-exclusive > > > Capture exclusive group: 0 > > > Capture channels: Mono > > > Mono: Capture [on] > > > Simple mixer control 'Headset Mic Boost',0 > > > Capabilities: volume > > > Playback channels: Front Left - Front Right > > > Capture channels: Front Left - Front Right > > > Limits: 0 - 3 > > > Front Left: 1 [33%] [10.00dB] > > > Front Right: 1 [33%] [10.00dB] > > > Simple mixer control 'Internal Mic',0 > > > Capabilities: cswitch cswitch-joined cswitch-exclusive > > > Capture exclusive group: 0 > > > Capture channels: Mono > > > Mono: Capture [off] > > > Simple mixer control 'Internal Mic Boost',0 > > > Capabilities: volume > > > Playback channels: Front Left - Front Right > > > Capture channels: Front Left - Front Right > > > Limits: 0 - 3 > > > Front Left: 0 [0%] [0.00dB] > > > Front Right: 0 [0%] [0.00dB] > > > Simple mixer control 'Master',0 > > > Capabilities: pvolume pvolume-joined pswitch pswitch-joined > > > Playback channels: Mono > > > Limits: Playback 0 - 87 > > > Mono: Playback 83 [95%] [-3.00dB] [on] > > > Simple mixer control 'Headphone',0 > > > Capabilities: pvolume pswitch > > > Playback channels: Front Left - Front Right > > > Limits: Playback 0 - 87 > > > Mono: > > > Front Left: Playback 87 [100%] [0.00dB] [on] > > > Front Right: Playback 87 [100%] [0.00dB] [on] > > > Simple mixer control 'Headphone Mic',0 > > > Capabilities: cswitch cswitch-joined cswitch-exclusive > > > Capture exclusive group: 0 > > > Capture channels: Mono > > > Mono: Capture [off] > > > Simple mixer control 'Headphone Mic Boost',0 > > > Capabilities: volume > > > Playback channels: Front Left - Front Right > > > Capture channels: Front Left - Front Right > > > Limits: 0 - 3 > > > Front Left: 0 [0%] [0.00dB] > > > Front Right: 0 [0%] [0.00dB] > > > Simple mixer control 'Speaker',0 > > > Capabilities: pvolume pswitch > > > Playback channels: Front Left - Front Right > > > Limits: Playback 0 - 87 > > > Mono: > > > Front Left: Playback 0 [0%] [-65.25dB] [off] > > > Front Right: Playback 0 [0%] [-65.25dB] [off] > > > Simple mixer control 'PCM',0 > > > Capabilities: pvolume > > > Playback channels: Front Left - Front Right > > > Limits: Playback 0 - 255 > > > Mono: > > > Front Left: Playback 255 [100%] [0.00dB] > > > Front Right: Playback 255 [100%] [0.00dB] > > > Simple mixer control 'IEC958',0 > > > Capabilities: pswitch pswitch-joined > > > Playback channels: Mono > > > Mono: Playback [off] > > > Simple mixer control 'IEC958',1 > > > Capabilities: pswitch pswitch-joined > > > Playback channels: Mono > > > Mono: Playback [on] > > > Simple mixer control 'IEC958',2 > > > Capabilities: pswitch pswitch-joined > > > Playback channels: Mono > > > Mono: Playback [on] > > > Simple mixer control 'IEC958',3 > > > Capabilities: pswitch pswitch-joined > > > Playback channels: Mono > > > Mono: Playback [on] > > > Simple mixer control 'IEC958',4 > > > Capabilities: pswitch pswitch-joined > > > Playback channels: Mono > > > Mono: Playback [on] > > > Simple mixer control 'Capture',0 > > > Capabilities: cvolume cswitch > > > Capture channels: Front Left - Front Right > > > Limits: Capture 0 - 63 > > > Front Left: Capture 63 [100%] [30.00dB] [on] > > > Front Right: Capture 63 [100%] [30.00dB] [on] > > > Simple mixer control 'Auto-Mute Mode',0 > > > Capabilities: enum > > > Items: 'Disabled' 'Enabled' > > > Item0: 'Disabled' > > > Simple mixer control 'Headset Mic',0 > > > Capabilities: cswitch cswitch-joined cswitch-exclusive > > > Capture exclusive group: 0 > > > Capture channels: Mono > > > Mono: Capture [on] > > > Simple mixer control 'Headset Mic Boost',0 > > > Capabilities: volume > > > Playback channels: Front Left - Front Right > > > Capture channels: Front Left - Front Right > > > Limits: 0 - 3 > > > Front Left: 1 [33%] [10.00dB] > > > Front Right: 1 [33%] [10.00dB] > > > Simple mixer control 'Internal Mic',0 > > > Capabilities: cswitch cswitch-joined cswitch-exclusive > > > Capture exclusive group: 0 > > > Capture channels: Mono > > > Mono: Capture [off] > > > Simple mixer control 'Internal Mic Boost',0 > > > Capabilities: volume > > > Playback channels: Front Left - Front Right > > > Capture channels: Front Left - Front Right > > > Limits: 0 - 3 > > > Front Left: 0 [0%] [0.00dB] > > > Front Right: 0 [0%] [0.00dB]

2 6

[alsa-devel] Question about aux device
by Kuninori Morimoto 29 May '19

29 May '19

Hi ALSA ML I wonder about aux device probe method. Does someone know about it ? (1) snd_soc_instantiate_card() binds all (normal) components by soc_bind_dai_link() ~~~~~~~~~~~~~~~~~ (2) And initialize/probe all binded (normal) components after that. Here, in this operation, it will calls soc_probe_component(). ~~~~~~~~~~~~~~~~~~~ (3) After that, auxiliary component is probed by using soc_probe_component() ~~~~~~~~~~~~~~~~~~~ (4) And, auxiliary component is binded by soc_bind_dai_link() after that. ~~~~~~~~~~~~~~~~~ static int snd_soc_instantiate_card(struct snd_soc_card *card) { ... /* probe normal components here */ for_each_card_prelinks(card, i, dai_link) { (1)=> ret = soc_bind_dai_link(card, dai_link); if (ret != 0) goto probe_end; } ... /* probe all components used by DAI links on this card */ for_each_comp_order(order) { for_each_card_rtds(card, rtd) { (2)=> ret = soc_probe_link_components(card, rtd, order); ... } } } /* probe auxiliary components */ (3)=> ret = soc_probe_aux_devices(card); ... for_each_card_links(card, dai_link) { ... (4)=> ret = soc_bind_dai_link(card, dai_link); ... } } 1st question is it seems the order of (1)/(2) and (3)/(4) are different. are there some reason about it ? or no reason ? 2nd question is can we merge these ? (1)+(4) and (2)+(3). Or do we have some reason ? For example (3)/(4) need to be called after xxxx. Thank you for your help !! Best regards --- Kuninori Morimoto

1 2

[alsa-devel] Question about card names
by Kuninori Morimoto 29 May '19

29 May '19

Hi ALSA ML snd_soc_instantiate_card() setups card->snd_card's "shortname", "longname", "driver" names. (= 1,2,3). But, it cares only card->snd_card->driver (= 4). I think we need to care about all naming, but why only driver ?? static int snd_soc_instantiate_card(struct snd_soc_card *card) { ... 1=> snprintf(card->snd_card->shortname, sizeof(card->snd_card->shortname), "%s", card->name); 2=> snprintf(card->snd_card->longname, sizeof(card->snd_card->longname), "%s", card->long_name ? card->long_name : card->name); 3=> snprintf(card->snd_card->driver, sizeof(card->snd_card->driver), "%s", card->driver_name ? card->driver_name : card->name); for (i = 0; i < ARRAY_SIZE(card->snd_card->driver); i++) { switch (card->snd_card->driver[i]) { x=> case '_': x=> case '-': case '\0': break; default: if (!isalnum(card->snd_card->driver[i])) 4=> card->snd_card->driver[i] = '_'; break; } } ... } And, it seems in this loop, it breaks check if it finds "_" or "-" (= x). If my understanding was correct, the naming "abcd??efg" will be fixed to "abcd__efg", but, it do nothing if name was for example "-abcd??efg". Is this bug ?? Thank you for your help !! Best regards --- Kuninori Morimoto

2 3

[alsa-devel] [PATCH] ALSA: hda/realtek - Improve the headset mic for Acer Aspire laptops
by Hui Wang 29 May '19

29 May '19

We met another Acer Aspire laptop which has the problem on the headset-mic, the Pin 0x19 is not set the corret configuration for a mic and the pin presence can't be detected too after plugging a headset. Kailang suggested that we should set the coeff to enable the mic and apply the ALC269_FIXUP_LIFEBOOK_EXTMIC. After doing that, both headset-mic presence and headset-mic work well. The existing ALC255_FIXUP_ACER_MIC_NO_PRESENCE set the headset-mic jack to be a phantom jack. Now since the jack can support presence unsol event, let us imporve it to set the jack to be a normal jack. https://bugs.launchpad.net/bugs/1821269 Fixes: 5824ce8de7b1c ("ALSA: hda/realtek - Add support for Acer Aspire E5-475 headset mic") Cc: Chris Chiu <chiu(a)endlessm.com> CC: Daniel Drake <drake(a)endlessm.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Kailang Yang <kailang(a)realtek.com> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index f1bac03e954b..f42a097f2e16 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6223,13 +6223,15 @@ static const struct hda_fixup alc269_fixups[] = { .chain_id = ALC269_FIXUP_THINKPAD_ACPI, }, [ALC255_FIXUP_ACER_MIC_NO_PRESENCE] = { - .type = HDA_FIXUP_PINS, - .v.pins = (const struct hda_pintbl[]) { - { 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */ - { } + .type = HDA_FIXUP_VERBS, + .v.verbs = (const struct hda_verb[]) { + /* Enable the Mic */ + { 0x20, AC_VERB_SET_COEF_INDEX, 0x45 }, + { 0x20, AC_VERB_SET_PROC_COEF, 0x5089 }, + {} }, .chained = true, - .chain_id = ALC255_FIXUP_HEADSET_MODE + .chain_id = ALC269_FIXUP_LIFEBOOK_EXTMIC }, [ALC255_FIXUP_ASUS_MIC_NO_PRESENCE] = { .type = HDA_FIXUP_PINS, @@ -7273,6 +7275,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x18, 0x02a11030}, {0x19, 0x0181303F}, {0x21, 0x0221102f}), + SND_HDA_PIN_QUIRK(0x10ec0255, 0x1025, "Acer", ALC255_FIXUP_ACER_MIC_NO_PRESENCE, + {0x12, 0x90a60140}, + {0x14, 0x90170120}, + {0x21, 0x02211030}), SND_HDA_PIN_QUIRK(0x10ec0255, 0x1025, "Acer", ALC255_FIXUP_ACER_MIC_NO_PRESENCE, {0x12, 0x90a601c0}, {0x14, 0x90171120}, -- 2.17.1

2 1

[alsa-devel] [PATCH] ASoC: Intel: Baytrail: add quirk for Aegex 10 (RU2) tablet
by Tamás Kovács 28 May '19

28 May '19

This tablet has an incorrect acpi identifier, which is why it is trying to load the RT5640 driver instead of the RT5762 driver. The RT5640 driver, on the other hand, checks the hardware ID, so no drivers are loaded during boot. This fix resolves to load the RT5672 driver on this tablet during boot. It also provides the correct IO configuration, like the jack detect mode 3, for 1.8V pullup. I would like to thank Pierre-Louis Bossart for helping with this patch. Signed-off-by: Kovács Tamás <kepszlok(a)gmail.com> --- diff --git a/ori/sound/soc/intel/common/soc-acpi-intel-byt-match.c b/new/sound/soc/intel/common/soc-acpi-intel-byt-match.c index fe812a9..e549950 100644 --- a/ori/sound/soc/intel/common/soc-acpi-intel-byt-match.c +++ b/new/sound/soc/intel/common/soc-acpi-intel-byt-match.c @@ -1,4 +1,4 @@ -/* +/* * soc-apci-intel-byt-match.c - tables and support for BYT ACPI enumeration. * * Copyright (c) 2017, Intel Corporation. @@ -22,6 +22,7 @@ static unsigned long byt_machine_id; #define BYT_THINKPAD_10 1 #define BYT_POV_P1006W 2 +#define BYT_AEGEX_10 3 static int byt_thinkpad10_quirk_cb(const struct dmi_system_id *id) { @@ -35,6 +36,12 @@ static int byt_pov_p1006w_quirk_cb(const struct dmi_system_id *id) return 1; } +static int byt_aegex10_quirk_cb(const struct dmi_system_id *id) +{ + byt_machine_id = BYT_AEGEX_10; + return 1; +} + static const struct dmi_system_id byt_table[] = { { .callback = byt_thinkpad10_quirk_cb, @@ -75,6 +82,14 @@ static const struct dmi_system_id byt_table[] = { DMI_EXACT_MATCH(DMI_BOARD_NAME, "0E57"), }, }, + { + /* Aegex 10 tablet (RU2) */ + .callback = byt_aegex10_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "AEGEX"), + DMI_MATCH(DMI_PRODUCT_VERSION, "RU2"), + }, + }, { } }; @@ -96,6 +111,15 @@ static struct snd_soc_acpi_mach byt_pov_p1006w = { .sof_tplg_filename = "sof-byt-rt5651.tplg", }; +static struct snd_soc_acpi_mach byt_aegex_10 = { + .id = "10EC5640", + .drv_name = "cht-bsw-rt5672", + .fw_filename = "intel/fw_sst_0f28.bin", + .board = "cht-bsw", + .sof_fw_filename = "intel/sof-byt.ri", + .sof_tplg_filename = "intel/sof-byt-rt5670.tplg", +}; + static struct snd_soc_acpi_mach *byt_quirk(void *arg) { struct snd_soc_acpi_mach *mach = arg; @@ -107,6 +131,8 @@ static struct snd_soc_acpi_mach *byt_quirk(void *arg) return &byt_thinkpad_10; case BYT_POV_P1006W: return &byt_pov_p1006w; + case BYT_AEGEX_10: + return &byt_aegex_10; default: return mach; } diff --git a/ori/sound/soc/codecs/rt5670.c b/new/sound/soc/codecs/rt5670.c index 9a03710..37cce04 100644 --- a/ori/sound/soc/codecs/rt5670.c +++ b/new/sound/soc/codecs/rt5670.c @@ -1,4 +1,4 @@ -/* +/* * rt5670.c -- RT5670 ALSA SoC audio codec driver * * Copyright 2014 Realtek Semiconductor Corp. @@ -2882,6 +2882,18 @@ static const struct dmi_system_id dmi_platform_intel_quirks[] = { RT5670_DEV_GPIO | RT5670_JD_MODE3), }, + { + .callback = rt5670_quirk_cb, + .ident = "Aegex 10 tablet (RU2)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "AEGEX"), + DMI_MATCH(DMI_PRODUCT_VERSION, "RU2"), + }, + .driver_data = (unsigned long *)(RT5670_DMIC_EN | + RT5670_DMIC2_INR | + RT5670_DEV_GPIO | + RT5670_JD_MODE3), + }, {} };

2 2