October 2022 - Alsa-devel - mailman.alsa-project.org

[PATCH] CHROMIUM: ASoC: amd: acp: Add tdm support for codecs in machine driver
by Venkata Prasad Potturu 09 Nov '22

09 Nov '22

From: Venkata Prasad Potturu <venkataprasad.potturu(a)amd.com> Add tdm support for rt5682, rt5682s, rt1019 and nau8825 codec in machine driver. Signed-off-by: Venkata Prasad Potturu <venkataprasad.potturu(a)amd.com> --- sound/soc/amd/acp/acp-mach-common.c | 255 ++++++++++++++++++++++++++-- 1 file changed, 243 insertions(+), 12 deletions(-) diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c index a78cf29387a7..bce3d8ed48ec 100644 --- a/sound/soc/amd/acp/acp-mach-common.c +++ b/sound/soc/amd/acp/acp-mach-common.c @@ -27,6 +27,21 @@ #include "../../codecs/nau8825.h" #include "acp-mach.h" +static int tdm_mode = 0; +module_param_named(tdm_mode, tdm_mode, int, 0444); +MODULE_PARM_DESC(tdm_mode, "Set 1 for tdm mode, set 0 for i2s mode"); + +#define TDM_CHANNELS 8 +#define BIT_WIDTH 16 +#define SLOT0 BIT(0) +#define SLOT1 BIT(1) +#define SLOT2 BIT(2) +#define SLOT3 BIT(3) +#define SLOT4 BIT(4) +#define SLOT5 BIT(5) +#define SLOT6 BIT(6) +#define SLOT7 BIT(7) + #define PCO_PLAT_CLK 48000000 #define RT5682_PLL_FREQ (48000 * 512) #define DUAL_CHANNEL 2 @@ -80,13 +95,19 @@ static int acp_card_rt5682_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; int ret; + unsigned int fmt; dev_info(rtd->dev, "codec dai name = %s\n", codec_dai->name); if (drvdata->hs_codec_id != RT5682) return -EINVAL; - ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF + if (tdm_mode) + fmt = SND_SOC_DAIFMT_DSP_A; + else + fmt = SND_SOC_DAIFMT_I2S; + + ret = snd_soc_dai_set_fmt(codec_dai, fmt | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP); if (ret < 0) { dev_err(rtd->card->dev, "Failed to set dai fmt: %d\n", ret); @@ -151,10 +172,15 @@ static int acp_card_hs_startup(struct snd_pcm_substream *substream) int ret; unsigned int fmt; + if (tdm_mode) + fmt = SND_SOC_DAIFMT_DSP_A; + else + fmt = SND_SOC_DAIFMT_I2S; + if (drvdata->soc_mclk) - fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC; + fmt = fmt | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC; else - fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP; + fmt = fmt | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP; ret = snd_soc_dai_set_fmt(codec_dai, fmt); if (ret < 0) { @@ -191,9 +217,65 @@ static void acp_card_shutdown(struct snd_pcm_substream *substream) clk_disable_unprepare(drvdata->wclk); } +static int acp_card_rt5682x_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + int ret; + unsigned int fmt; + + if (tdm_mode) + fmt = SND_SOC_DAIFMT_DSP_A; + else + fmt = SND_SOC_DAIFMT_I2S; + + ret = snd_soc_dai_set_fmt(cpu_dai, fmt | SND_SOC_DAIFMT_NB_NF + | SND_SOC_DAIFMT_CBP_CFP); + if (ret && ret != -ENOTSUPP) { + dev_err(rtd->dev, "Failed to set dai fmt: %d\n", ret); + return ret; + } + + if (tdm_mode) { + /** + * As codec supports slot 0 and slot 1 for playback and capture. + */ + ret = snd_soc_dai_set_tdm_slot(cpu_dai, SLOT0 | SLOT1, SLOT0 | SLOT1, + TDM_CHANNELS, BIT_WIDTH); + if (ret && ret != -ENOTSUPP) { + dev_err(rtd->dev, "set TDM slot err: %d\n", ret); + return ret; + } + } + + ret = snd_soc_dai_set_fmt(codec_dai, fmt | SND_SOC_DAIFMT_NB_NF + | SND_SOC_DAIFMT_CBC_CFC); + if (ret < 0) { + dev_err(rtd->card->dev, "Failed to set dai fmt: %d\n", ret); + return ret; + } + + if (tdm_mode) { + /** + * As codec supports slot 0 and slot 1 for playback and capture. + */ + ret = snd_soc_dai_set_tdm_slot(codec_dai, SLOT0 | SLOT1, SLOT0 | SLOT1, + TDM_CHANNELS, BIT_WIDTH); + if (ret < 0) { + dev_warn(rtd->dev, "set TDM slot err:%d\n", ret); + return ret; + } + } + + return 0; +} + static const struct snd_soc_ops acp_card_rt5682_ops = { .startup = acp_card_hs_startup, .shutdown = acp_card_shutdown, + .hw_params = acp_card_rt5682x_hw_params, }; /* Define RT5682S CODEC component*/ @@ -220,10 +302,15 @@ static int acp_card_rt5682s_init(struct snd_soc_pcm_runtime *rtd) if (drvdata->hs_codec_id != RT5682S) return -EINVAL; + if (tdm_mode) + fmt = SND_SOC_DAIFMT_DSP_A; + else + fmt = SND_SOC_DAIFMT_I2S; + if (drvdata->soc_mclk) - fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC; + fmt = fmt | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC; else - fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP; + fmt = fmt | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP; ret = snd_soc_dai_set_fmt(codec_dai, fmt); if (ret < 0) { @@ -283,6 +370,7 @@ static int acp_card_rt5682s_init(struct snd_soc_pcm_runtime *rtd) static const struct snd_soc_ops acp_card_rt5682s_ops = { .startup = acp_card_hs_startup, + .hw_params = acp_card_rt5682x_hw_params, }; static const unsigned int dmic_channels[] = { @@ -351,19 +439,48 @@ static int acp_card_rt1019_hw_params(struct snd_pcm_substream *substream, struct snd_soc_card *card = rtd->card; struct acp_card_drvdata *drvdata = card->drvdata; struct snd_soc_dai *codec_dai; + struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); int srate, i, ret = 0; + unsigned int fmt; srate = params_rate(params); if (drvdata->amp_codec_id != RT1019) return -EINVAL; + if (tdm_mode) + fmt = SND_SOC_DAIFMT_DSP_A; + else + fmt = SND_SOC_DAIFMT_I2S; + + ret = snd_soc_dai_set_fmt(cpu_dai, fmt | SND_SOC_DAIFMT_NB_NF + | SND_SOC_DAIFMT_CBP_CFP); + if (ret && ret != -ENOTSUPP) { + dev_err(rtd->dev, "Failed to set dai fmt: %d\n", ret); + return ret; + } + + if (tdm_mode) { + /** + * As codec supports slot 2 and slot 3 for playback. + */ + ret = snd_soc_dai_set_tdm_slot(cpu_dai, SLOT2 | SLOT3, 0, TDM_CHANNELS, BIT_WIDTH); + if (ret && ret != -ENOTSUPP) { + dev_err(rtd->dev, "set TDM slot err: %d\n", ret); + return ret; + } + } for_each_rtd_codec_dais(rtd, i, codec_dai) { if (strcmp(codec_dai->name, "rt1019-aif")) continue; - ret = snd_soc_dai_set_pll(codec_dai, 0, RT1019_PLL_S_BCLK, - 64 * srate, 256 * srate); + if (tdm_mode) + ret = snd_soc_dai_set_pll(codec_dai, 0, RT1019_PLL_S_BCLK, + 128 * srate, 256 * srate); + else + ret = snd_soc_dai_set_pll(codec_dai, 0, RT1019_PLL_S_BCLK, + 64 * srate, 256 * srate); + if (ret < 0) return ret; @@ -371,8 +488,36 @@ static int acp_card_rt1019_hw_params(struct snd_pcm_substream *substream, 256 * srate, SND_SOC_CLOCK_IN); if (ret < 0) return ret; - } + if (tdm_mode) { + ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_A + | SND_SOC_DAIFMT_NB_NF); + if (ret < 0) { + dev_err(rtd->card->dev, "Failed to set dai fmt: %d\n", ret); + return ret; + } + + /** + * As codec supports slot 2 for left channel playback. + */ + if (!strcmp(codec_dai->component->name, "i2c-10EC1019:00")) { + ret = snd_soc_dai_set_tdm_slot(codec_dai, SLOT2, SLOT2, + TDM_CHANNELS, BIT_WIDTH); + if (ret < 0) + break; + } + + /** + * As codec supports slot 3 for right channel playback. + */ + if (!strcmp(codec_dai->component->name, "i2c-10EC1019:01")) { + ret = snd_soc_dai_set_tdm_slot(codec_dai, SLOT3, SLOT3, + TDM_CHANNELS, BIT_WIDTH); + if (ret < 0) + break; + } + } + } return 0; } @@ -426,9 +571,43 @@ static int acp_card_maxim_init(struct snd_soc_pcm_runtime *rtd) ARRAY_SIZE(max98360a_map)); } +static int acp_card_maxim_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + unsigned int fmt; + int ret; + + if (tdm_mode) + fmt = SND_SOC_DAIFMT_DSP_A; + else + fmt = SND_SOC_DAIFMT_I2S; + + ret = snd_soc_dai_set_fmt(cpu_dai, fmt | SND_SOC_DAIFMT_NB_NF + | SND_SOC_DAIFMT_CBP_CFP); + if (ret && ret != -ENOTSUPP) { + dev_err(rtd->dev, "Failed to set dai fmt: %d\n", ret); + return ret; + } + + if (tdm_mode) { + /** + * As codec supports slot 2 and slot 3 for playback. + */ + ret = snd_soc_dai_set_tdm_slot(cpu_dai, SLOT2 | SLOT3, 0, TDM_CHANNELS, BIT_WIDTH); + if (ret && ret != -ENOTSUPP) { + dev_err(rtd->dev, "set TDM slot err: %d\n", ret); + return ret; + } + } + return 0; +} + static const struct snd_soc_ops acp_card_maxim_ops = { .startup = acp_card_amp_startup, .shutdown = acp_card_shutdown, + .hw_params = acp_card_maxim_hw_params, }; /* Declare nau8825 codec components */ @@ -454,10 +633,15 @@ static int acp_card_nau8825_init(struct snd_soc_pcm_runtime *rtd) if (drvdata->hs_codec_id != NAU8825) return -EINVAL; + if (tdm_mode) + fmt = SND_SOC_DAIFMT_DSP_A; + else + fmt = SND_SOC_DAIFMT_I2S; + if (drvdata->soc_mclk) - fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC; + fmt = fmt | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC; else - fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP; + fmt = fmt | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP; ret = snd_soc_dai_set_fmt(codec_dai, fmt); if (ret < 0) { @@ -493,8 +677,34 @@ static int acp_nau8825_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); int ret; + unsigned int fmt; + if (tdm_mode) + fmt = SND_SOC_DAIFMT_DSP_A; + else + fmt = SND_SOC_DAIFMT_I2S; + + ret = snd_soc_dai_set_fmt(cpu_dai, fmt | SND_SOC_DAIFMT_NB_NF + | SND_SOC_DAIFMT_CBP_CFP); + if (ret && ret != -ENOTSUPP) { + dev_err(rtd->dev, "Failed to set dai fmt: %d\n", ret); + return ret; + } + + if (tdm_mode) { + /** + * As codec supports slot 4 and slot 5 for playback + * and slot 6 and slot 7 for capture. + */ + ret = snd_soc_dai_set_tdm_slot(cpu_dai, SLOT4 | SLOT5, SLOT6 | SLOT7, + TDM_CHANNELS, BIT_WIDTH); + if (ret && ret != -ENOTSUPP) { + dev_err(rtd->dev, "set TDM slot err: %d\n", ret); + return ret; + } + } ret = snd_soc_dai_set_sysclk(codec_dai, NAU8825_CLK_FLL_FS, (48000 * 256), SND_SOC_CLOCK_IN); if (ret < 0) @@ -507,6 +717,25 @@ static int acp_nau8825_hw_params(struct snd_pcm_substream *substream, return ret; } + ret = snd_soc_dai_set_fmt(codec_dai, fmt | SND_SOC_DAIFMT_NB_NF + | SND_SOC_DAIFMT_CBC_CFC); + if (ret < 0) { + dev_err(rtd->card->dev, "Failed to set dai fmt: %d\n", ret); + return ret; + } + + if (tdm_mode) { + /** + * As codec supports slot 4 and slot 5 for playback and slot 6 for capture. + */ + ret = snd_soc_dai_set_tdm_slot(codec_dai, SLOT6, SLOT4 | SLOT5, + TDM_CHANNELS, BIT_WIDTH); + if (ret < 0) { + dev_warn(rtd->dev, "set TDM slot err:%d\n", ret); + return ret; + } + } + return ret; } @@ -567,6 +796,8 @@ SND_SOC_DAILINK_DEF(sof_sp, DAILINK_COMP_ARRAY(COMP_CPU("acp-sof-sp"))); SND_SOC_DAILINK_DEF(sof_hs, DAILINK_COMP_ARRAY(COMP_CPU("acp-sof-hs"))); +SND_SOC_DAILINK_DEF(sof_hs_virtual, + DAILINK_COMP_ARRAY(COMP_CPU("acp-sof-hs-virtual"))); SND_SOC_DAILINK_DEF(sof_dmic, DAILINK_COMP_ARRAY(COMP_CPU("acp-sof-dmic"))); SND_SOC_DAILINK_DEF(pdm_dmic, @@ -733,8 +964,8 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) if (drv_data->amp_cpu_id == I2S_HS) { links[i].name = "acp-amp-codec"; links[i].id = AMP_BE_ID; - links[i].cpus = sof_hs; - links[i].num_cpus = ARRAY_SIZE(sof_hs); + links[i].cpus = sof_hs_virtual; + links[i].num_cpus = ARRAY_SIZE(sof_hs_virtual); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); links[i].dpcm_playback = 1; -- 2.25.1

4 11

[PATCH v3 0/3] arm64/slimbus/dt-bindings: convert to DT Schema, minor cleanups
by Krzysztof Kozlowski 09 Nov '22

09 Nov '22

Hi, Changes since v2 ================ 1. None, rebased and dropped applied patches. Changes since v1 ================ 1. Fix commit title typo (Steev). 2. Add Rb/Tb tags. Dependencies ============ No dependencies. Binding patches are independent from DTS. Best regards, Krzysztof Krzysztof Kozlowski (3): dt-bindings: slimbus: convert bus description to DT schema dt-bindings: slimbus: qcom,slim: convert to DT schema dt-bindings: slimbus: qcom,slim-ngd: convert to DT schema .../devicetree/bindings/slimbus/bus.txt | 60 --------- .../bindings/slimbus/qcom,slim-ngd.yaml | 120 ++++++++++++++++++ .../bindings/slimbus/qcom,slim.yaml | 86 +++++++++++++ .../bindings/slimbus/slim-ngd-qcom-ctrl.txt | 84 ------------ .../bindings/slimbus/slim-qcom-ctrl.txt | 39 ------ .../devicetree/bindings/slimbus/slimbus.yaml | 95 ++++++++++++++ 6 files changed, 301 insertions(+), 183 deletions(-) delete mode 100644 Documentation/devicetree/bindings/slimbus/bus.txt create mode 100644 Documentation/devicetree/bindings/slimbus/qcom,slim-ngd.yaml create mode 100644 Documentation/devicetree/bindings/slimbus/qcom,slim.yaml delete mode 100644 Documentation/devicetree/bindings/slimbus/slim-ngd-qcom-ctrl.txt delete mode 100644 Documentation/devicetree/bindings/slimbus/slim-qcom-ctrl.txt create mode 100644 Documentation/devicetree/bindings/slimbus/slimbus.yaml -- 2.34.1

2 5

[PATCH v1] ASoC: sof_es8336: reduce pop noise on speaker
by Zhu Ning 07 Nov '22

07 Nov '22

The Speaker GPIO needs to be turned on slightly behind the codec turned on. It also need to be turned off slightly before the codec turned down. Current code uses delay in DAPM_EVENT to do it but the mdelay delays the DAPM itself and thus has no effect. A delayed_work is added to turn on the speaker. The Speaker is turned off in .trigger since trigger is called slightly before the DAPM events. Signed-off-by: Zhu Ning <zhuning(a)everest-semi.com> ------------ v1: cancel delayed work while disabling speaker. --- sound/soc/intel/boards/sof_es8336.c | 60 ++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 14 deletions(-) diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c index fbb42e54947a..70713e4b07dc 100644 --- a/sound/soc/intel/boards/sof_es8336.c +++ b/sound/soc/intel/boards/sof_es8336.c @@ -63,6 +63,7 @@ struct sof_es8336_private { struct snd_soc_jack jack; struct list_head hdmi_pcm_list; bool speaker_en; + struct delayed_work pcm_pop_work; }; struct sof_hdmi_pcm { @@ -111,6 +112,46 @@ static void log_quirks(struct device *dev) dev_info(dev, "quirk headset at mic1 port enabled\n"); } +static void pcm_pop_work_events(struct work_struct *work) +{ + struct sof_es8336_private *priv = + container_of(work, struct sof_es8336_private, pcm_pop_work.work); + + gpiod_set_value_cansleep(priv->gpio_speakers, priv->speaker_en); + + if (quirk & SOF_ES8336_HEADPHONE_GPIO) + gpiod_set_value_cansleep(priv->gpio_headphone, priv->speaker_en); + +} + +static int sof_8336_trigger(struct snd_pcm_substream *substream, int cmd) +{ + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_card *card = rtd->card; + struct sof_es8336_private *priv = snd_soc_card_get_drvdata(card); + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + case SNDRV_PCM_TRIGGER_RESUME: + break; + + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_STOP: + if (priv->speaker_en == false) + if (substream->stream == 0) { + cancel_delayed_work(&priv->pcm_pop_work); + gpiod_set_value_cansleep(priv->gpio_speakers, true); + } + break; + default: + return -EINVAL; + } + + return 0; +} + static int sof_es8316_speaker_power_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { @@ -122,19 +163,7 @@ static int sof_es8316_speaker_power_event(struct snd_soc_dapm_widget *w, priv->speaker_en = !SND_SOC_DAPM_EVENT_ON(event); - if (SND_SOC_DAPM_EVENT_ON(event)) - msleep(70); - - gpiod_set_value_cansleep(priv->gpio_speakers, priv->speaker_en); - - if (!(quirk & SOF_ES8336_HEADPHONE_GPIO)) - return 0; - - if (SND_SOC_DAPM_EVENT_ON(event)) - msleep(70); - - gpiod_set_value_cansleep(priv->gpio_headphone, priv->speaker_en); - + queue_delayed_work(system_wq, &priv->pcm_pop_work, msecs_to_jiffies(70)); return 0; } @@ -344,6 +373,7 @@ static int sof_es8336_hw_params(struct snd_pcm_substream *substream, /* machine stream operations */ static struct snd_soc_ops sof_es8336_ops = { .hw_params = sof_es8336_hw_params, + .trigger = sof_8336_trigger, }; static struct snd_soc_dai_link_component platform_component[] = { @@ -723,7 +753,8 @@ static int sof_es8336_probe(struct platform_device *pdev) } INIT_LIST_HEAD(&priv->hdmi_pcm_list); - + INIT_DELAYED_WORK(&priv->pcm_pop_work, + pcm_pop_work_events); snd_soc_card_set_drvdata(card, priv); if (mach->mach_params.dmic_num > 0) { @@ -752,6 +783,7 @@ static int sof_es8336_remove(struct platform_device *pdev) struct snd_soc_card *card = platform_get_drvdata(pdev); struct sof_es8336_private *priv = snd_soc_card_get_drvdata(card); + cancel_delayed_work(&priv->pcm_pop_work); gpiod_put(priv->gpio_speakers); device_remove_software_node(priv->codec_dev); put_device(priv->codec_dev); -- 2.37.2

2 1

[PATCH] ASoC: dapm: Don't use prefix for regulator name
by Paul Cercueil 07 Nov '22

07 Nov '22

When a component has a prefix, and uses a SND_SOC_DAPM_REGULATOR_SUPPLY, the name of the regulator should not use the prefix, otherwise it won't be properly matched in the DT/ACPI. Fixes: 3caac759681e ("ASoC: soc-dapm.c: fixup snd_soc_dapm_new_control_unlocked() error handling") Signed-off-by: Paul Cercueil <paul(a)crapouillou.net> --- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index d515e7a78ea8..879cf1be67a9 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3645,7 +3645,7 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, switch (w->id) { case snd_soc_dapm_regulator_supply: - w->regulator = devm_regulator_get(dapm->dev, w->name); + w->regulator = devm_regulator_get(dapm->dev, widget->name); if (IS_ERR(w->regulator)) { ret = PTR_ERR(w->regulator); goto request_failed; -- 2.35.1

2 4

Question regarding delayed trigger in dpcm_set_fe_update_state()
by Cezary Rojewski 07 Nov '22

07 Nov '22

Hello, Writing with question regarding dpcm_set_fe_update_state() function which is part of sound/soc/soc-pcm.c file and has been introduced with commit "ASoC: dpcm: Fix race between FE/BE updates and trigger" [1]. The part that concerns me is the invocation of dpcm_fe_dai_do_trigger() regardless of the actual state given DPCM is in (actual state, not the DPCM_UPDATE_XX). The conditional invocation of said _trigger() and addition of .trigger_pending field are here to address a race where PCM state is being modified from multiple locations simultaneously, at least judging by the commit's description. Note that the dpcm_set_fe_update_state() is called from all the dai-ops i.e.: startup, shutdown, hw_params, prepare and hw_free. Now, given that knowledge, we could end up in scenario where dpcm_fe_dai_do_trigger() is invoked as a part of dpcm_fe_dai_hw_free(). dpcm_set_fe_update_state() is called there twice, once with DPCM_UPDATE_FE and once with DPCM_UPDATE_NO. The second case is the more interesting one since it's called **after** ->hw_free() callback is invoked for all the DAIs. dpcm_fe_dai_hw_free() dpcm_set_fe_update_state(DPCM_UPDATE_FE) // fine (...) dpcm_be_dai_hw_free() // data allocated in hw_params // is freed here (...) dpcm_set_fe_update_state(DPCM_UPDATE_NO) // not fine The last is *not fine* if the .trigger_pending is not a zero, and can lead to panic as code used during ->trigger() is often manipulating data allocated during ->hw_params() but that data has just been freed with ->hw_free(). Is what I'm looking at a bug? Or, perhaps there's something I'm missing in the picture. From my study, it seems that only dpcm_fe_dai_prepare() is a safe place for calling dpcm_fe_dai_do_trigger() - once .trigger_pending is taken into account. Any input is much appreciated. [1]: https://lore.kernel.org/all/1415116348-11792-1-git-send-email-tiwai@suse.de… Regards, Czarek

2 3

[PATCH 00/30] ARM: pxa: remove all unused boards&drivers
by Arnd Bergmann 04 Nov '22

04 Nov '22

From: Arnd Bergmann <arnd(a)arndb.de> Most of the legacy PXA board files were marked as unused in linux-5.19 and can get removed in linux-6.2. There is support for pxa250/pxa270/pxa300 using devicetree already, which supports a number of boards, but progress on converting the remaining ones has stalled over the past few years. The two boards that are left in the tree for now are the three 'sharpsl' variants (spitz/akita/borzoi) and the 'gumstix' family of machines. Both of these are supported by qemu, which can be helpful for completing the DT conversion. Only PXA25x and PXA27x are left with full boardfile support, so PXA300 can get a lot simpler while still working with DT, and PXA310/320/93x can be removed entirely. A good number of drivers become impossible to select after this, so each of these also get dropped. I'm including the driver patches in the series here and can either merge them through the soc tree, or they can get picked up by the individual subsystem maintainers. Since both the platform and the drivers get removed, the order should not matter. Note that the patches here are generated with 'git format-patch -D' and don't contain the contents of removed files because of the significant size (the first patch is close to a megabyte). Arnd Bergmann (30): ARM: pxa: remove unused board files ARM: pxa: remove irda leftover ARM: pxa: remove unused pxa3xx-ulpi ARM: pxa: drop pxa310/pxa320/pxa93x support ARM: pxa: prune unused device support power: remove z2_battery driver power: remove tosa_battery driver ata: remove palmld pata driver backlight: remove pxa tosa support input: remove pxa930_trkball driver input: remove pxa930_rotary keyboard driver input: remove zylonite touchscreen driver pcmcia: remove unused pxa/sa1100 drivers ASoC: pxa: remove unused board support ALSA: remove ac97 bus support mfd: remove wm97xx driver input: remove wm97xx support parport: remove ax88796 driver power: remove pda_power supply driver rtc: remove v3020 driver mfd: remove toshiba tmio drivers mfd: remove ucb1400 support mtd: remove tmio_nand driver mmc: remove tmio_mmc driver fbdev: remove tmiofb driver fbdev: remove w100fb driver leds: remove asic3 driver usb: remove ohci-tmio driver w1: remove ds1wm driver mfd: remove htc-pasic3 driver Cc: stern(a)rowland.harvard.edu Cc: alexandre.belloni(a)bootlin.com Cc: brgl(a)bgdev.pl Cc: damien.lemoal(a)opensource.wdc.com Cc: daniel(a)zonque.org Cc: dmitry.torokhov(a)gmail.com Cc: linux(a)dominikbrodowski.net Cc: balbi(a)kernel.org Cc: gregkh(a)linuxfoundation.org Cc: haojian.zhuang(a)gmail.com Cc: deller(a)gmx.de Cc: perex(a)perex.cz Cc: jingoohan1(a)gmail.com Cc: lee(a)kernel.org Cc: kernel(a)wantstofly.org Cc: lgirdwood(a)gmail.com Cc: linus.walleij(a)linaro.org Cc: marek.vasut(a)gmail.com Cc: broonie(a)kernel.org Cc: mkpetch(a)internode.on.net Cc: miquel.raynal(a)bootlin.com Cc: lost.distance(a)yahoo.com Cc: philipp.zabel(a)gmail.com Cc: robert.jarzmik(a)free.fr Cc: linux(a)armlinux.org.uk Cc: sre(a)kernel.org Cc: slapin(a)ossfans.org Cc: s.shtylyov(a)omp.ru Cc: sudipm.mukherjee(a)gmail.com Cc: tiwai(a)suse.com Cc: ulf.hansson(a)linaro.org Cc: vigneshr(a)ti.com Cc: viresh.kumar(a)linaro.org Cc: wsa+renesas(a)sang-engineering.com Cc: linux-pm(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-ide(a)vger.kernel.org Cc: linux-gpio(a)vger.kernel.org Cc: linux-input(a)vger.kernel.org Cc: patches(a)opensource.cirrus.com Cc: linux-leds(a)vger.kernel.org Cc: linux-mmc(a)vger.kernel.org Cc: linux-renesas-soc(a)vger.kernel.org Cc: linux-mtd(a)lists.infradead.org Cc: linux-rtc(a)vger.kernel.org Cc: linux-usb(a)vger.kernel.org Cc: dri-devel(a)lists.freedesktop.org Cc: linux-fbdev(a)vger.kernel.org Cc: alsa-devel(a)alsa-project.org Documentation/power/power_supply_class.rst | 4 +- MAINTAINERS | 100 +- arch/arm/Kconfig | 1 - arch/arm/configs/cm_x300_defconfig | 163 -- arch/arm/configs/colibri_pxa270_defconfig | 157 -- arch/arm/configs/colibri_pxa300_defconfig | 60 - arch/arm/configs/corgi_defconfig | 247 --- arch/arm/configs/eseries_pxa_defconfig | 97 - arch/arm/configs/ezx_defconfig | 389 ---- arch/arm/configs/h5000_defconfig | 74 - arch/arm/configs/lpd270_defconfig | 58 - arch/arm/configs/lubbock_defconfig | 53 - arch/arm/configs/magician_defconfig | 151 -- arch/arm/configs/mainstone_defconfig | 51 - arch/arm/configs/palmz72_defconfig | 75 - arch/arm/configs/pcm027_defconfig | 90 - arch/arm/configs/pxa255-idp_defconfig | 55 - arch/arm/configs/pxa_defconfig | 3 - arch/arm/configs/trizeps4_defconfig | 207 --- arch/arm/configs/viper_defconfig | 160 -- arch/arm/configs/xcep_defconfig | 89 - arch/arm/configs/zeus_defconfig | 173 -- arch/arm/mach-pxa/Kconfig | 583 +----- arch/arm/mach-pxa/Makefile | 60 +- arch/arm/mach-pxa/balloon3-pcmcia.c | 137 -- arch/arm/mach-pxa/balloon3.c | 821 -------- arch/arm/mach-pxa/balloon3.h | 181 -- arch/arm/mach-pxa/capc7117.c | 159 -- arch/arm/mach-pxa/cm-x300.c | 883 --------- arch/arm/mach-pxa/colibri-evalboard.c | 138 -- arch/arm/mach-pxa/colibri-pcmcia.c | 165 -- arch/arm/mach-pxa/colibri-pxa270-income.c | 236 --- arch/arm/mach-pxa/colibri-pxa270.c | 330 ---- arch/arm/mach-pxa/colibri-pxa300.c | 193 -- arch/arm/mach-pxa/colibri-pxa320.c | 264 --- arch/arm/mach-pxa/colibri-pxa3xx.c | 147 -- arch/arm/mach-pxa/colibri.h | 70 - arch/arm/mach-pxa/corgi.c | 826 --------- arch/arm/mach-pxa/corgi.h | 110 -- arch/arm/mach-pxa/corgi_pm.c | 221 --- arch/arm/mach-pxa/csb701.c | 67 - arch/arm/mach-pxa/csb726.c | 291 --- arch/arm/mach-pxa/csb726.h | 24 - arch/arm/mach-pxa/devices.c | 408 ---- arch/arm/mach-pxa/devices.h | 3 - arch/arm/mach-pxa/e740-pcmcia.c | 127 -- arch/arm/mach-pxa/eseries-gpio.h | 63 - arch/arm/mach-pxa/eseries-irq.h | 24 - arch/arm/mach-pxa/eseries.c | 1001 ---------- arch/arm/mach-pxa/ezx.c | 1254 ------------- arch/arm/mach-pxa/h5000.c | 210 --- arch/arm/mach-pxa/h5000.h | 109 -- arch/arm/mach-pxa/himalaya.c | 166 -- arch/arm/mach-pxa/hx4700-pcmcia.c | 118 -- arch/arm/mach-pxa/hx4700.c | 942 ---------- arch/arm/mach-pxa/hx4700.h | 129 -- arch/arm/mach-pxa/icontrol.c | 218 --- arch/arm/mach-pxa/idp.c | 285 --- arch/arm/mach-pxa/idp.h | 195 -- arch/arm/mach-pxa/littleton.c | 462 ----- arch/arm/mach-pxa/littleton.h | 14 - arch/arm/mach-pxa/lpd270.c | 518 ------ arch/arm/mach-pxa/lpd270.h | 40 - arch/arm/mach-pxa/lubbock.c | 649 ------- arch/arm/mach-pxa/lubbock.h | 47 - arch/arm/mach-pxa/magician.c | 1112 ----------- arch/arm/mach-pxa/magician.h | 125 -- arch/arm/mach-pxa/mainstone.c | 738 -------- arch/arm/mach-pxa/mainstone.h | 140 -- arch/arm/mach-pxa/mfp-pxa25x.h | 33 - arch/arm/mach-pxa/mfp-pxa2xx.c | 4 - arch/arm/mach-pxa/mfp-pxa300.h | 52 - arch/arm/mach-pxa/mfp-pxa320.h | 458 ----- arch/arm/mach-pxa/mfp-pxa930.h | 495 ----- arch/arm/mach-pxa/mioa701.c | 784 -------- arch/arm/mach-pxa/mioa701.h | 76 - arch/arm/mach-pxa/mioa701_bootresume.S | 38 - arch/arm/mach-pxa/mp900.c | 101 - arch/arm/mach-pxa/mxm8x10.c | 477 ----- arch/arm/mach-pxa/mxm8x10.h | 22 - arch/arm/mach-pxa/palm27x.c | 473 ----- arch/arm/mach-pxa/palm27x.h | 77 - arch/arm/mach-pxa/palmld-pcmcia.c | 111 -- arch/arm/mach-pxa/palmld.c | 392 ---- arch/arm/mach-pxa/palmld.h | 107 -- arch/arm/mach-pxa/palmt5.c | 234 --- arch/arm/mach-pxa/palmt5.h | 82 - arch/arm/mach-pxa/palmtc-pcmcia.c | 162 -- arch/arm/mach-pxa/palmtc.c | 539 ------ arch/arm/mach-pxa/palmtc.h | 84 - arch/arm/mach-pxa/palmte2.c | 383 ---- arch/arm/mach-pxa/palmte2.h | 64 - arch/arm/mach-pxa/palmtreo.c | 548 ------ arch/arm/mach-pxa/palmtreo.h | 64 - arch/arm/mach-pxa/palmtx-pcmcia.c | 111 -- arch/arm/mach-pxa/palmtx.c | 390 ---- arch/arm/mach-pxa/palmtx.h | 110 -- arch/arm/mach-pxa/palmz72.c | 319 ---- arch/arm/mach-pxa/palmz72.h | 80 - arch/arm/mach-pxa/pcm027.c | 266 --- arch/arm/mach-pxa/pcm027.h | 73 - arch/arm/mach-pxa/pcm990-baseboard.c | 408 ---- arch/arm/mach-pxa/pcm990_baseboard.h | 199 -- arch/arm/mach-pxa/pm.c | 2 - arch/arm/mach-pxa/pm.h | 10 - arch/arm/mach-pxa/poodle.c | 484 ----- arch/arm/mach-pxa/poodle.h | 92 - arch/arm/mach-pxa/pxa25x.c | 7 - arch/arm/mach-pxa/pxa27x.c | 18 +- arch/arm/mach-pxa/pxa27x.h | 3 - arch/arm/mach-pxa/pxa2xx.c | 29 - arch/arm/mach-pxa/pxa300.c | 17 +- arch/arm/mach-pxa/pxa320.c | 88 - arch/arm/mach-pxa/pxa320.h | 9 - arch/arm/mach-pxa/pxa3xx-ulpi.c | 385 ---- arch/arm/mach-pxa/pxa3xx.c | 91 - arch/arm/mach-pxa/pxa930.c | 217 --- arch/arm/mach-pxa/pxa930.h | 8 - arch/arm/mach-pxa/pxa_cplds_irqs.c | 200 -- arch/arm/mach-pxa/regs-u2d.h | 199 -- arch/arm/mach-pxa/regs-uart.h | 146 -- arch/arm/mach-pxa/saar.c | 604 ------ arch/arm/mach-pxa/sharpsl_pm.c | 4 - arch/arm/mach-pxa/spitz.c | 23 - arch/arm/mach-pxa/tavorevb.c | 506 ----- arch/arm/mach-pxa/tosa-bt.c | 134 -- arch/arm/mach-pxa/tosa.c | 946 ---------- arch/arm/mach-pxa/tosa.h | 165 -- arch/arm/mach-pxa/tosa_bt.h | 18 - arch/arm/mach-pxa/trizeps4-pcmcia.c | 200 -- arch/arm/mach-pxa/trizeps4.c | 575 ------ arch/arm/mach-pxa/trizeps4.h | 166 -- arch/arm/mach-pxa/viper-pcmcia.c | 180 -- arch/arm/mach-pxa/viper-pcmcia.h | 12 - arch/arm/mach-pxa/viper.c | 1034 ----------- arch/arm/mach-pxa/viper.h | 91 - arch/arm/mach-pxa/vpac270-pcmcia.c | 137 -- arch/arm/mach-pxa/vpac270.c | 736 -------- arch/arm/mach-pxa/vpac270.h | 38 - arch/arm/mach-pxa/xcep.c | 190 -- arch/arm/mach-pxa/z2.c | 781 -------- arch/arm/mach-pxa/z2.h | 37 - arch/arm/mach-pxa/zeus.c | 974 ---------- arch/arm/mach-pxa/zeus.h | 82 - arch/arm/mach-pxa/zylonite.c | 495 ----- arch/arm/mach-pxa/zylonite.h | 45 - arch/arm/mach-pxa/zylonite_pxa300.c | 281 --- arch/arm/mach-pxa/zylonite_pxa320.c | 213 --- arch/arm/mach-tegra/tegra.c | 1 - drivers/ata/Kconfig | 9 - drivers/ata/Makefile | 1 - drivers/ata/pata_palmld.c | 137 -- drivers/clk/pxa/clk-pxa3xx.c | 22 +- drivers/cpufreq/pxa3xx-cpufreq.c | 21 +- drivers/gpio/Kconfig | 7 - drivers/gpio/Makefile | 1 - drivers/gpio/gpio-ucb1400.c | 85 - drivers/input/keyboard/Kconfig | 9 - drivers/input/keyboard/Makefile | 1 - drivers/input/keyboard/pxa930_rotary.c | 195 -- drivers/input/mouse/Kconfig | 6 - drivers/input/mouse/Makefile | 1 - drivers/input/mouse/pxa930_trkball.c | 250 --- drivers/input/touchscreen/Kconfig | 81 - drivers/input/touchscreen/Makefile | 8 - drivers/input/touchscreen/mainstone-wm97xx.c | 10 - drivers/input/touchscreen/ucb1400_ts.c | 458 ----- drivers/input/touchscreen/wm9705.c | 345 ---- drivers/input/touchscreen/wm9712.c | 466 ----- drivers/input/touchscreen/wm9713.c | 476 ----- drivers/input/touchscreen/wm97xx-core.c | 910 --------- drivers/input/touchscreen/zylonite-wm97xx.c | 220 --- drivers/leds/Kconfig | 11 - drivers/leds/Makefile | 1 - drivers/leds/leds-asic3.c | 177 -- drivers/mfd/Kconfig | 72 - drivers/mfd/Makefile | 8 - drivers/mfd/asic3.c | 1071 ----------- drivers/mfd/htc-pasic3.c | 210 --- drivers/mfd/t7l66xb.c | 432 ----- drivers/mfd/tc6387xb.c | 233 --- drivers/mfd/tc6393xb.c | 912 --------- drivers/mfd/tmio_core.c | 70 - drivers/mfd/ucb1400_core.c | 158 -- drivers/mfd/wm97xx-core.c | 362 ---- drivers/mmc/host/Kconfig | 8 - drivers/mmc/host/Makefile | 1 - drivers/mmc/host/pxamci.c | 3 +- drivers/mmc/host/tmio_mmc.c | 227 --- drivers/mtd/nand/raw/Kconfig | 7 - drivers/mtd/nand/raw/Makefile | 1 - drivers/mtd/nand/raw/tmio_nand.c | 533 ------ drivers/parport/Kconfig | 11 - drivers/parport/Makefile | 1 - drivers/parport/parport_ax88796.c | 418 ----- drivers/pcmcia/Kconfig | 12 +- drivers/pcmcia/Makefile | 5 - drivers/pcmcia/pxa2xx_base.c | 14 +- drivers/pcmcia/pxa2xx_mainstone.c | 122 -- drivers/pcmcia/sa1100_simpad.c | 115 -- drivers/pcmcia/sa1111_badge4.c | 158 -- drivers/pcmcia/sa1111_generic.c | 4 - drivers/pcmcia/sa1111_lubbock.c | 155 -- drivers/power/supply/Kconfig | 22 - drivers/power/supply/Makefile | 3 - drivers/power/supply/ds2760_battery.c | 8 - drivers/power/supply/pda_power.c | 520 ------ drivers/power/supply/tosa_battery.c | 512 ----- drivers/power/supply/z2_battery.c | 317 ---- drivers/rtc/Kconfig | 9 - drivers/rtc/Makefile | 1 - drivers/rtc/rtc-v3020.c | 369 ---- drivers/usb/gadget/udc/pxa25x_udc.c | 62 - drivers/usb/host/ohci-hcd.c | 18 - drivers/usb/host/ohci-pxa27x.c | 9 - drivers/usb/host/ohci-tmio.c | 364 ---- drivers/video/backlight/Kconfig | 14 - drivers/video/backlight/Makefile | 2 - drivers/video/backlight/locomolcd.c | 10 - drivers/video/backlight/tosa_bl.c | 173 -- drivers/video/backlight/tosa_bl.h | 8 - drivers/video/backlight/tosa_lcd.c | 284 --- drivers/video/fbdev/Kconfig | 39 - drivers/video/fbdev/Makefile | 2 - drivers/video/fbdev/tmiofb.c | 1040 ----------- drivers/video/fbdev/w100fb.c | 1644 ----------------- drivers/video/fbdev/w100fb.h | 924 --------- drivers/w1/masters/Kconfig | 7 - drivers/w1/masters/Makefile | 1 - drivers/w1/masters/ds1wm.c | 675 ------- include/linux/mfd/asic3.h | 313 ---- include/linux/mfd/htc-pasic3.h | 54 - include/linux/mfd/t7l66xb.h | 29 - include/linux/mfd/tc6387xb.h | 19 - include/linux/mfd/tc6393xb.h | 53 - include/linux/mfd/tmio.h | 5 - include/linux/parport.h | 5 - include/linux/pda_power.h | 39 - include/linux/platform_data/asoc-palm27x.h | 9 - include/linux/platform_data/asoc-poodle.h | 16 - include/linux/platform_data/asoc-pxa.h | 31 - include/linux/platform_data/irda-pxaficp.h | 26 - .../platform_data/keyboard-pxa930_rotary.h | 21 - include/linux/platform_data/mmp_audio.h | 18 - .../platform_data/mouse-pxa930_trkball.h | 11 - include/linux/platform_data/rtc-v3020.h | 41 - include/linux/platform_data/usb-pxa3xx-ulpi.h | 32 - include/linux/soc/pxa/cpu.h | 93 +- include/linux/ucb1400.h | 160 -- include/linux/z2_battery.h | 17 - include/sound/ac97/codec.h | 116 -- include/sound/ac97/compat.h | 17 - include/sound/ac97/controller.h | 83 - include/video/w100fb.h | 147 -- sound/Kconfig | 3 - sound/Makefile | 1 - sound/ac97/Kconfig | 19 - sound/ac97/Makefile | 9 - sound/ac97/ac97_core.h | 13 - sound/ac97/bus.c | 557 ------ sound/ac97/codec.c | 12 - sound/ac97/snd_ac97_compat.c | 120 -- sound/arm/Kconfig | 13 - sound/arm/Makefile | 4 - sound/arm/pxa2xx-ac97-lib.c | 466 ----- sound/arm/pxa2xx-ac97-regs.h | 100 - sound/arm/pxa2xx-ac97.c | 293 --- sound/pci/ac97/ac97_codec.c | 1 - sound/pci/ac97/ac97_patch.c | 40 - sound/soc/codecs/wm9705.c | 2 - sound/soc/codecs/wm9712.c | 2 - sound/soc/codecs/wm9713.c | 2 - sound/soc/pxa/Kconfig | 183 -- sound/soc/pxa/Makefile | 35 - sound/soc/pxa/brownstone.c | 133 -- sound/soc/pxa/corgi.c | 332 ---- sound/soc/pxa/e740_wm9705.c | 168 -- sound/soc/pxa/e750_wm9705.c | 147 -- sound/soc/pxa/e800_wm9712.c | 147 -- sound/soc/pxa/em-x270.c | 92 - sound/soc/pxa/hx4700.c | 207 --- sound/soc/pxa/magician.c | 366 ---- sound/soc/pxa/mioa701_wm9713.c | 201 -- sound/soc/pxa/mmp-pcm.c | 267 --- sound/soc/pxa/palm27x.c | 162 -- sound/soc/pxa/poodle.c | 291 --- sound/soc/pxa/pxa2xx-ac97.c | 307 --- sound/soc/pxa/pxa2xx-i2s.c | 2 - sound/soc/pxa/tosa.c | 255 --- sound/soc/pxa/ttc-dkb.c | 143 -- sound/soc/pxa/z2.c | 218 --- sound/soc/pxa/zylonite.c | 266 --- 292 files changed, 24 insertions(+), 59127 deletions(-) delete mode 100644 arch/arm/configs/cm_x300_defconfig delete mode 100644 arch/arm/configs/colibri_pxa270_defconfig delete mode 100644 arch/arm/configs/colibri_pxa300_defconfig delete mode 100644 arch/arm/configs/corgi_defconfig delete mode 100644 arch/arm/configs/eseries_pxa_defconfig delete mode 100644 arch/arm/configs/ezx_defconfig delete mode 100644 arch/arm/configs/h5000_defconfig delete mode 100644 arch/arm/configs/lpd270_defconfig delete mode 100644 arch/arm/configs/lubbock_defconfig delete mode 100644 arch/arm/configs/magician_defconfig delete mode 100644 arch/arm/configs/mainstone_defconfig delete mode 100644 arch/arm/configs/palmz72_defconfig delete mode 100644 arch/arm/configs/pcm027_defconfig delete mode 100644 arch/arm/configs/pxa255-idp_defconfig delete mode 100644 arch/arm/configs/trizeps4_defconfig delete mode 100644 arch/arm/configs/viper_defconfig delete mode 100644 arch/arm/configs/xcep_defconfig delete mode 100644 arch/arm/configs/zeus_defconfig delete mode 100644 arch/arm/mach-pxa/balloon3-pcmcia.c delete mode 100644 arch/arm/mach-pxa/balloon3.c delete mode 100644 arch/arm/mach-pxa/balloon3.h delete mode 100644 arch/arm/mach-pxa/capc7117.c delete mode 100644 arch/arm/mach-pxa/cm-x300.c delete mode 100644 arch/arm/mach-pxa/colibri-evalboard.c delete mode 100644 arch/arm/mach-pxa/colibri-pcmcia.c delete mode 100644 arch/arm/mach-pxa/colibri-pxa270-income.c delete mode 100644 arch/arm/mach-pxa/colibri-pxa270.c delete mode 100644 arch/arm/mach-pxa/colibri-pxa300.c delete mode 100644 arch/arm/mach-pxa/colibri-pxa320.c delete mode 100644 arch/arm/mach-pxa/colibri-pxa3xx.c delete mode 100644 arch/arm/mach-pxa/colibri.h delete mode 100644 arch/arm/mach-pxa/corgi.c delete mode 100644 arch/arm/mach-pxa/corgi.h delete mode 100644 arch/arm/mach-pxa/corgi_pm.c delete mode 100644 arch/arm/mach-pxa/csb701.c delete mode 100644 arch/arm/mach-pxa/csb726.c delete mode 100644 arch/arm/mach-pxa/csb726.h delete mode 100644 arch/arm/mach-pxa/e740-pcmcia.c delete mode 100644 arch/arm/mach-pxa/eseries-gpio.h delete mode 100644 arch/arm/mach-pxa/eseries-irq.h delete mode 100644 arch/arm/mach-pxa/eseries.c delete mode 100644 arch/arm/mach-pxa/ezx.c delete mode 100644 arch/arm/mach-pxa/h5000.c delete mode 100644 arch/arm/mach-pxa/h5000.h delete mode 100644 arch/arm/mach-pxa/himalaya.c delete mode 100644 arch/arm/mach-pxa/hx4700-pcmcia.c delete mode 100644 arch/arm/mach-pxa/hx4700.c delete mode 100644 arch/arm/mach-pxa/hx4700.h delete mode 100644 arch/arm/mach-pxa/icontrol.c delete mode 100644 arch/arm/mach-pxa/idp.c delete mode 100644 arch/arm/mach-pxa/idp.h delete mode 100644 arch/arm/mach-pxa/littleton.c delete mode 100644 arch/arm/mach-pxa/littleton.h delete mode 100644 arch/arm/mach-pxa/lpd270.c delete mode 100644 arch/arm/mach-pxa/lpd270.h delete mode 100644 arch/arm/mach-pxa/lubbock.c delete mode 100644 arch/arm/mach-pxa/lubbock.h delete mode 100644 arch/arm/mach-pxa/magician.c delete mode 100644 arch/arm/mach-pxa/magician.h delete mode 100644 arch/arm/mach-pxa/mainstone.c delete mode 100644 arch/arm/mach-pxa/mainstone.h delete mode 100644 arch/arm/mach-pxa/mfp-pxa320.h delete mode 100644 arch/arm/mach-pxa/mfp-pxa930.h delete mode 100644 arch/arm/mach-pxa/mioa701.c delete mode 100644 arch/arm/mach-pxa/mioa701.h delete mode 100644 arch/arm/mach-pxa/mioa701_bootresume.S delete mode 100644 arch/arm/mach-pxa/mp900.c delete mode 100644 arch/arm/mach-pxa/mxm8x10.c delete mode 100644 arch/arm/mach-pxa/mxm8x10.h delete mode 100644 arch/arm/mach-pxa/palm27x.c delete mode 100644 arch/arm/mach-pxa/palm27x.h delete mode 100644 arch/arm/mach-pxa/palmld-pcmcia.c delete mode 100644 arch/arm/mach-pxa/palmld.c delete mode 100644 arch/arm/mach-pxa/palmld.h delete mode 100644 arch/arm/mach-pxa/palmt5.c delete mode 100644 arch/arm/mach-pxa/palmt5.h delete mode 100644 arch/arm/mach-pxa/palmtc-pcmcia.c delete mode 100644 arch/arm/mach-pxa/palmtc.c delete mode 100644 arch/arm/mach-pxa/palmtc.h delete mode 100644 arch/arm/mach-pxa/palmte2.c delete mode 100644 arch/arm/mach-pxa/palmte2.h delete mode 100644 arch/arm/mach-pxa/palmtreo.c delete mode 100644 arch/arm/mach-pxa/palmtreo.h delete mode 100644 arch/arm/mach-pxa/palmtx-pcmcia.c delete mode 100644 arch/arm/mach-pxa/palmtx.c delete mode 100644 arch/arm/mach-pxa/palmtx.h delete mode 100644 arch/arm/mach-pxa/palmz72.c delete mode 100644 arch/arm/mach-pxa/palmz72.h delete mode 100644 arch/arm/mach-pxa/pcm027.c delete mode 100644 arch/arm/mach-pxa/pcm027.h delete mode 100644 arch/arm/mach-pxa/pcm990-baseboard.c delete mode 100644 arch/arm/mach-pxa/pcm990_baseboard.h delete mode 100644 arch/arm/mach-pxa/poodle.c delete mode 100644 arch/arm/mach-pxa/poodle.h delete mode 100644 arch/arm/mach-pxa/pxa320.c delete mode 100644 arch/arm/mach-pxa/pxa320.h delete mode 100644 arch/arm/mach-pxa/pxa3xx-ulpi.c delete mode 100644 arch/arm/mach-pxa/pxa930.c delete mode 100644 arch/arm/mach-pxa/pxa930.h delete mode 100644 arch/arm/mach-pxa/pxa_cplds_irqs.c delete mode 100644 arch/arm/mach-pxa/regs-u2d.h delete mode 100644 arch/arm/mach-pxa/regs-uart.h delete mode 100644 arch/arm/mach-pxa/saar.c delete mode 100644 arch/arm/mach-pxa/tavorevb.c delete mode 100644 arch/arm/mach-pxa/tosa-bt.c delete mode 100644 arch/arm/mach-pxa/tosa.c delete mode 100644 arch/arm/mach-pxa/tosa.h delete mode 100644 arch/arm/mach-pxa/tosa_bt.h delete mode 100644 arch/arm/mach-pxa/trizeps4-pcmcia.c delete mode 100644 arch/arm/mach-pxa/trizeps4.c delete mode 100644 arch/arm/mach-pxa/trizeps4.h delete mode 100644 arch/arm/mach-pxa/viper-pcmcia.c delete mode 100644 arch/arm/mach-pxa/viper-pcmcia.h delete mode 100644 arch/arm/mach-pxa/viper.c delete mode 100644 arch/arm/mach-pxa/viper.h delete mode 100644 arch/arm/mach-pxa/vpac270-pcmcia.c delete mode 100644 arch/arm/mach-pxa/vpac270.c delete mode 100644 arch/arm/mach-pxa/vpac270.h delete mode 100644 arch/arm/mach-pxa/xcep.c delete mode 100644 arch/arm/mach-pxa/z2.c delete mode 100644 arch/arm/mach-pxa/z2.h delete mode 100644 arch/arm/mach-pxa/zeus.c delete mode 100644 arch/arm/mach-pxa/zeus.h delete mode 100644 arch/arm/mach-pxa/zylonite.c delete mode 100644 arch/arm/mach-pxa/zylonite.h delete mode 100644 arch/arm/mach-pxa/zylonite_pxa300.c delete mode 100644 arch/arm/mach-pxa/zylonite_pxa320.c delete mode 100644 drivers/ata/pata_palmld.c delete mode 100644 drivers/gpio/gpio-ucb1400.c delete mode 100644 drivers/input/keyboard/pxa930_rotary.c delete mode 100644 drivers/input/mouse/pxa930_trkball.c delete mode 100644 drivers/input/touchscreen/ucb1400_ts.c delete mode 100644 drivers/input/touchscreen/wm9705.c delete mode 100644 drivers/input/touchscreen/wm9712.c delete mode 100644 drivers/input/touchscreen/wm9713.c delete mode 100644 drivers/input/touchscreen/wm97xx-core.c delete mode 100644 drivers/input/touchscreen/zylonite-wm97xx.c delete mode 100644 drivers/leds/leds-asic3.c delete mode 100644 drivers/mfd/asic3.c delete mode 100644 drivers/mfd/htc-pasic3.c delete mode 100644 drivers/mfd/t7l66xb.c delete mode 100644 drivers/mfd/tc6387xb.c delete mode 100644 drivers/mfd/tc6393xb.c delete mode 100644 drivers/mfd/tmio_core.c delete mode 100644 drivers/mfd/ucb1400_core.c delete mode 100644 drivers/mfd/wm97xx-core.c delete mode 100644 drivers/mmc/host/tmio_mmc.c delete mode 100644 drivers/mtd/nand/raw/tmio_nand.c delete mode 100644 drivers/parport/parport_ax88796.c delete mode 100644 drivers/pcmcia/pxa2xx_mainstone.c delete mode 100644 drivers/pcmcia/sa1100_simpad.c delete mode 100644 drivers/pcmcia/sa1111_badge4.c delete mode 100644 drivers/pcmcia/sa1111_lubbock.c delete mode 100644 drivers/power/supply/pda_power.c delete mode 100644 drivers/power/supply/tosa_battery.c delete mode 100644 drivers/power/supply/z2_battery.c delete mode 100644 drivers/rtc/rtc-v3020.c delete mode 100644 drivers/usb/host/ohci-tmio.c delete mode 100644 drivers/video/backlight/tosa_bl.c delete mode 100644 drivers/video/backlight/tosa_bl.h delete mode 100644 drivers/video/backlight/tosa_lcd.c delete mode 100644 drivers/video/fbdev/tmiofb.c delete mode 100644 drivers/video/fbdev/w100fb.c delete mode 100644 drivers/video/fbdev/w100fb.h delete mode 100644 drivers/w1/masters/ds1wm.c delete mode 100644 include/linux/mfd/asic3.h delete mode 100644 include/linux/mfd/htc-pasic3.h delete mode 100644 include/linux/mfd/t7l66xb.h delete mode 100644 include/linux/mfd/tc6387xb.h delete mode 100644 include/linux/mfd/tc6393xb.h delete mode 100644 include/linux/pda_power.h delete mode 100644 include/linux/platform_data/asoc-palm27x.h delete mode 100644 include/linux/platform_data/asoc-poodle.h delete mode 100644 include/linux/platform_data/asoc-pxa.h delete mode 100644 include/linux/platform_data/irda-pxaficp.h delete mode 100644 include/linux/platform_data/keyboard-pxa930_rotary.h delete mode 100644 include/linux/platform_data/mmp_audio.h delete mode 100644 include/linux/platform_data/mouse-pxa930_trkball.h delete mode 100644 include/linux/platform_data/rtc-v3020.h delete mode 100644 include/linux/platform_data/usb-pxa3xx-ulpi.h delete mode 100644 include/linux/ucb1400.h delete mode 100644 include/linux/z2_battery.h delete mode 100644 include/sound/ac97/codec.h delete mode 100644 include/sound/ac97/compat.h delete mode 100644 include/sound/ac97/controller.h delete mode 100644 include/video/w100fb.h delete mode 100644 sound/ac97/Kconfig delete mode 100644 sound/ac97/Makefile delete mode 100644 sound/ac97/ac97_core.h delete mode 100644 sound/ac97/bus.c delete mode 100644 sound/ac97/codec.c delete mode 100644 sound/ac97/snd_ac97_compat.c delete mode 100644 sound/arm/pxa2xx-ac97-lib.c delete mode 100644 sound/arm/pxa2xx-ac97-regs.h delete mode 100644 sound/arm/pxa2xx-ac97.c delete mode 100644 sound/soc/pxa/brownstone.c delete mode 100644 sound/soc/pxa/corgi.c delete mode 100644 sound/soc/pxa/e740_wm9705.c delete mode 100644 sound/soc/pxa/e750_wm9705.c delete mode 100644 sound/soc/pxa/e800_wm9712.c delete mode 100644 sound/soc/pxa/em-x270.c delete mode 100644 sound/soc/pxa/hx4700.c delete mode 100644 sound/soc/pxa/magician.c delete mode 100644 sound/soc/pxa/mioa701_wm9713.c delete mode 100644 sound/soc/pxa/mmp-pcm.c delete mode 100644 sound/soc/pxa/palm27x.c delete mode 100644 sound/soc/pxa/poodle.c delete mode 100644 sound/soc/pxa/pxa2xx-ac97.c delete mode 100644 sound/soc/pxa/tosa.c delete mode 100644 sound/soc/pxa/ttc-dkb.c delete mode 100644 sound/soc/pxa/z2.c delete mode 100644 sound/soc/pxa/zylonite.c -- 2.29.2

5 7

[PATCH 0/8] Adjust usage of rt5682(s) power supply properties
by Nícolas F. R. A. Prado 03 Nov '22

03 Nov '22

This series sets straight the usage of power supply properties for the rt5682 and rt5682s audio codecs. These properties were already being used by sc7180-trogdor.dtsi (and derived DTs like sc7180-trogdor-kingoftown.dtsi). We start by documenting the power supplies that are already in use and then add few others that were missing to the bindings. Then we update the drivers to also support the new supplies. Finally we update the trogdor DTs so they have the newly added but required supplies and remove a superfluous one that was causing warnings. Nícolas F. R. A. Prado (8): ASoC: dt-bindings: realtek,rt5682s: Add AVDD and MICVDD supplies ASoC: dt-bindings: realtek,rt5682s: Add dbvdd and ldo1-in supplies ASoC: dt-bindings: rt5682: Add AVDD, MICVDD and VBAT supplies ASoC: dt-bindings: rt5682: Add dbvdd and ldo1-in supplies ASoC: rt5682s: Support dbvdd and ldo1-in supplies ASoC: rt5682: Support dbvdd and ldo1-in supplies arm64: dts: qcom: sc7180-trogdor: Add missing supplies for rt5682 arm64: dts: qcom: sc7180-trogdor: Remove VBAT supply from rt5682s .../bindings/sound/realtek,rt5682s.yaml | 23 +++++++++++++++++++ .../devicetree/bindings/sound/rt5682.txt | 20 ++++++++++++++++ .../dts/qcom/sc7180-trogdor-kingoftown.dtsi | 1 + ...0-trogdor-wormdingler-rev1-boe-rt5682s.dts | 1 + ...0-trogdor-wormdingler-rev1-inx-rt5682s.dts | 1 + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 2 ++ sound/soc/codecs/rt5682.c | 2 ++ sound/soc/codecs/rt5682.h | 2 +- sound/soc/codecs/rt5682s.c | 22 ++++++++++++++++++ sound/soc/codecs/rt5682s.h | 2 ++ 10 files changed, 75 insertions(+), 1 deletion(-) -- 2.38.1

5 18

[PATCH] ASoC: simple-mux: add read function
by Maarten Zanders 03 Nov '22

03 Nov '22

During initialisation DAPM tries to read the state of the MUX being connected, resulting in this error log: input-mux: ASoC: error at soc_component_read_no_lock on input-mux: -5 Provide a read function which allows DAPM to read the state of the MUX. Signed-off-by: Maarten Zanders <maarten.zanders(a)mind.be> --- sound/soc/codecs/simple-mux.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/soc/codecs/simple-mux.c b/sound/soc/codecs/simple-mux.c index d30c0d24d90a..bf67de12d20b 100644 --- a/sound/soc/codecs/simple-mux.c +++ b/sound/soc/codecs/simple-mux.c @@ -55,6 +55,14 @@ static int simple_mux_control_put(struct snd_kcontrol *kcontrol, e, NULL); } +static unsigned int simple_mux_read(struct snd_soc_component *component, + unsigned int reg) +{ + struct simple_mux *priv = snd_soc_component_get_drvdata(component); + + return priv->mux; +} + static const struct snd_kcontrol_new simple_mux_mux = SOC_DAPM_ENUM_EXT("Muxer", simple_mux_enum, simple_mux_control_get, simple_mux_control_put); @@ -76,6 +84,7 @@ static const struct snd_soc_component_driver simple_mux_component_driver = { .num_dapm_widgets = ARRAY_SIZE(simple_mux_dapm_widgets), .dapm_routes = simple_mux_dapm_routes, .num_dapm_routes = ARRAY_SIZE(simple_mux_dapm_routes), + .read = simple_mux_read, }; static int simple_mux_probe(struct platform_device *pdev) -- 2.37.3

2 1

[PATCH v5 0/2] Modify documentation and machine driver for mt8186_rt1019_rt5682s sound card
by Ajye Huang 02 Nov '22

02 Nov '22

v5: - Documentation: - Add #include <dt-bindings/gpio/gpio.h> in order to use GPIO_ACTIVE_HIGH. - Remove the change-id in message. v4: - Documentation: - Fix the FATAL ERROR: Unable to parse input tree. v3: - Documentation: - Add an explain example in description. - Add the pinctrl-name and pinctrl id in its example. v2: - dmic codec driver: - Remove the unnecessary use of_property_read_bool() v1: - Documentation: Add dmic-gpios optional prop for two DMICs case. - dmic codec driver: - "dmic-gpios" property is used for amixer control to switch the dmic signal source between the Front and Rear Dmic. Thanks for the review! Ajye Huang (2): ASoC: mediatek: dt-bindings: modify machine bindings for two MICs case ASoC: mediatek: mt8186-rt5682: Modify machine driver for two DMICs case .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 14 ++- .../mt8186/mt8186-mt6366-rt1019-rt5682s.c | 102 +++++++++++++++++- 2 files changed, 114 insertions(+), 2 deletions(-) -- 2.25.1

3 5

[PATCH v3 1/2] ASoC: Intel: Skylake: fix possible memory leak in skl_codec_device_init()
by Yang Yingliang 02 Nov '22

02 Nov '22

If snd_hdac_device_register() fails, 'codec' and name allocated in dev_set_name() called in snd_hdac_device_init() are leaked. Fix this by calling put_device(), so they can be freed in snd_hda_codec_dev_release() and kobject_cleanup(). Fixes: e4746d94d00c ("ASoC: Intel: Skylake: Introduce HDA codec init and exit routines") Fixes: dfe66a18780d ("ALSA: hdac_ext: add extended HDA bus") Suggested-by: Cezary Rojewski <cezary.rojewski(a)intel.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- v2 -> v3: add suggest tag v1 -> v2: remove skl_codec_device_exit() and use snd_hda_codec_dev_release() to fix leak --- sound/soc/intel/skylake/skl.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index bbba2df33aaf..3312b57e3c0c 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -689,11 +689,6 @@ static void load_codec_module(struct hda_codec *codec) #endif /* CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC */ -static void skl_codec_device_exit(struct device *dev) -{ - snd_hdac_device_exit(dev_to_hdac_dev(dev)); -} - static struct hda_codec *skl_codec_device_init(struct hdac_bus *bus, int addr) { struct hda_codec *codec; @@ -706,12 +701,11 @@ static struct hda_codec *skl_codec_device_init(struct hdac_bus *bus, int addr) } codec->core.type = HDA_DEV_ASOC; - codec->core.dev.release = skl_codec_device_exit; ret = snd_hdac_device_register(&codec->core); if (ret) { dev_err(bus->dev, "failed to register hdac device\n"); - snd_hdac_device_exit(&codec->core); + put_device(&codec->core.dev); return ERR_PTR(ret); } -- 2.25.1

3 3