]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'soundwire-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Aug 2025 18:09:27 +0000 (11:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Aug 2025 18:09:27 +0000 (11:09 -0700)
Pull soundwire updates from Vinod Koul:
 "A couple of small core changes and driver updates:

   - Core: handling of nesting irqs to outside the lock, stream
     parameters handing on port prep failures.

   - AMD driver support for ACP 7.2 platforms and improved handing of
     slave alerts and resume sequences

   - Qualcomm updating driver debug spew

   - Intel BPT message length limitations, rt721 codec as wake capable
     etc"

* tag 'soundwire-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
  soundwire: amd: Add support for acp7.2 platform
  soundwire: stream: restore params when prepare ports fail
  soundwire: debugfs: move debug statement outside of error handling
  soundwire: amd: add check for status update registers
  soundwire: intel_auxdevice: add rt721 codec to wake_capable_list
  soundwire: Correct some property names
  soundwire: update Intel BPT message length limitation
  soundwire: intel_ace2.x: Use str_read_write() helper
  soundwire: amd: cancel pending slave status handling workqueue during remove sequence
  soundwire: amd: serialize amd manager resume sequence during pm_prepare
  soundwire: qcom: demote probe registration printk
  ASoC: cs42l43: Remove unnecessary work functions
  soundwire: Move handle_nested_irq outside of sdw_dev_lock
  MAINTAINERS: Remove Sanyog Kale as reviewer on SoundWire

1  2 
MAINTAINERS
drivers/soundwire/amd_manager.c
drivers/soundwire/qcom.c
sound/soc/codecs/cs42l43-jack.c
sound/soc/codecs/cs42l43.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
index f5c5150c25e523c828292af9144d73b40d8e6ffa,72a4150709de80f779efd440e440e5b3361abe93..2a0a4986a9ce8f452c893ab29437b911401dc770
@@@ -422,24 -429,16 +428,15 @@@ irqreturn_t cs42l43_button_press(int ir
  error:
        mutex_unlock(&priv->jack_lock);
  
 -      pm_runtime_mark_last_busy(priv->dev);
        pm_runtime_put_autosuspend(priv->dev);
- }
- irqreturn_t cs42l43_button_press(int irq, void *data)
- {
-       struct cs42l43_codec *priv = data;
-       // Wait for 2 full cycles of comb filter to ensure good reading
-       queue_delayed_work(system_wq, &priv->button_press_work,
-                          msecs_to_jiffies(20));
  
-       return IRQ_HANDLED;
+       return iret;
  }
  
void cs42l43_button_release_work(struct work_struct *work)
irqreturn_t cs42l43_button_release(int irq, void *data)
  {
-       struct cs42l43_codec *priv = container_of(work, struct cs42l43_codec,
-                                                 button_release_work);
+       struct cs42l43_codec *priv = data;
+       irqreturn_t iret = IRQ_NONE;
        int ret;
  
        ret = pm_runtime_resume_and_get(priv->dev);
  
        mutex_unlock(&priv->jack_lock);
  
 -      pm_runtime_mark_last_busy(priv->dev);
        pm_runtime_put_autosuspend(priv->dev);
- }
  
- irqreturn_t cs42l43_button_release(int irq, void *data)
- {
-       struct cs42l43_codec *priv = data;
-       queue_work(system_wq, &priv->button_release_work);
-       return IRQ_HANDLED;
+       return iret;
  }
  
  void cs42l43_bias_sense_timeout(struct work_struct *work)
Simple merge