Catcrafts/milos-linux
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "TEST: aw88261: restore async start (revert of caea99ac809d) — q6apm starts BE clocks at trigger, after DAPM PRE_PMU"

Browse source 
This reverts commit 157350ab1f.
This commit is contained in:
Jorijn van der Graaf 2026-07-05 04:49:51 +02:00
commit 4b413eda9b
2 changed files with 1 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

29
sound/soc/codecs/aw88261.c
View file

@ -642,16 +642,6 @@ static void aw88261_start_pa(struct aw88261 *aw88261)
dev_err(aw88261->aw_pa->dev, "start failure (%d)\n", ret);
}
static void aw88261_startup_work(struct work_struct *work)
{
struct aw88261 *aw88261 =
container_of(work, struct aw88261, start_work.work);
mutex_lock(&aw88261->lock);
aw88261_start_pa(aw88261);
mutex_unlock(&aw88261->lock);
}
static void aw88261_start(struct aw88261 *aw88261)
{
if (aw88261->aw_pa->fw_status != AW88261_DEV_FW_OK)
@ -660,14 +650,7 @@ static void aw88261_start(struct aw88261 *aw88261)
if (aw88261->aw_pa->status == AW88261_DEV_PW_ON)
return;
/*
* TEST HACK (revert of caea99ac809d): on q6apm/AudioReach the BE
* port only starts clocking at trigger, after DAPM PRE_PMU; a
* synchronous start here always sees NOCLKS. Defer to a work so
* it runs after the trigger.
*/
queue_delayed_work(system_dfl_wq, &aw88261->start_work,
AW88261_START_WORK_DELAY_MS);
aw88261_start_pa(aw88261);
}
static int aw88261_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
@ -1221,8 +1204,6 @@ static int aw88261_codec_probe(struct snd_soc_component *component)
struct aw88261 *aw88261 = snd_soc_component_get_drvdata(component);
int ret;
INIT_DELAYED_WORK(&aw88261->start_work, aw88261_startup_work);
ret = aw88261_request_firmware_file(aw88261);
if (ret)
return dev_err_probe(aw88261->aw_pa->dev, ret,
@ -1246,16 +1227,8 @@ static int aw88261_codec_probe(struct snd_soc_component *component)
return ret;
}
static void aw88261_codec_remove(struct snd_soc_component *aw_codec)
{
struct aw88261 *aw88261 = snd_soc_component_get_drvdata(aw_codec);
cancel_delayed_work_sync(&aw88261->start_work);
}
static const struct snd_soc_component_driver soc_codec_dev_aw88261 = {
.probe = aw88261_codec_probe,
.remove = aw88261_codec_remove,
};
static void aw88261_parse_channel_dt(struct aw88261 *aw88261)

1
sound/soc/codecs/aw88261.h
View file

@ -584,7 +584,6 @@ enum {
struct aw88261 {
struct aw_device *aw_pa;
struct mutex lock;
struct delayed_work start_work;
struct gpio_desc *reset_gpio;
struct regmap *regmap;
struct aw_container *aw_cfg;