Commit 46be92e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes that have been gathered since rc1:

   - Lots of small ASoC SOF Intel fixes

   - A couple of UAF and NULL-dereference fixes

   - Quirks and updates for HD-audio, USB-audio and ASoC AMD

   - A few minor build / sparse warning fixes

   - MAINTAINERS and DT updates"

* tag 'sound-6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (38 commits)
  ALSA: hda: Add NVIDIA codec IDs a3 through a7 to patch table
  ALSA: oss: avoid missing-prototype warnings
  ALSA: cs46xx: mark snd_cs46xx_download_image as static
  ALSA: hda: Fix Oops by 9.1 surround channel names
  ASoC: SOF: topology: Fix tuples array allocation
  ASoC: SOF: Separate the tokens for input and output pin index
  MAINTAINERS: Remove self from Cirrus Codec drivers
  ASoC: cs35l56: Prevent unbalanced pm_runtime in dsp_work() on SoundWire
  ASoC: SOF: topology: Fix logic for copying tuples
  ASoC: SOF: pm: save io region state in case of errors in resume
  ASoC: MAINTAINERS: drop Krzysztof Kozlowski from Samsung audio
  ASoC: mediatek: mt8186: Fix use-after-free in driver remove path
  ASoC: SOF: ipc3-topology: Make sure that only one cmd is sent in dai_config
  ASoC: SOF: sof-client-probes: fix pm_runtime imbalance in error handling
  ASoC: SOF: pcm: fix pm_runtime imbalance in error handling
  ASoC: SOF: debug: conditionally bump runtime_pm counter on exceptions
  ASoC: SOF: Intel: hda-mlink: add helper to program SoundWire PCMSyCM registers
  ASoC: SOF: Intel: hda-mlink: initialize instance_offset member
  ASoC: SOF: Intel: hda-mlink: use 'ml_addr' parameter consistently
  ASoC: SOF: Intel: hda-mlink: fix base_ptr computation
  ...
parents f4a8871f dc4f2cca

Documentation/devicetree/bindings/sound/tas2562.yaml

+4 −2
Original line number Diff line number Diff line
@@ -55,7 +55,9 @@ properties: 
    description: TDM TX current sense time slot.



  '#sound-dai-cells':

    const: 1

    # The codec has a single DAI, the #sound-dai-cells=<1>; case is left in for backward

    # compatibility but is deprecated.

    enum: [0, 1]



required:

  - compatible
@@ -72,7 +74,7 @@ examples: 
     codec: codec@4c {

       compatible = "ti,tas2562";

       reg = <0x4c>;

       #sound-dai-cells = <1>;

       #sound-dai-cells = <0>;

       interrupt-parent = <&gpio1>;

       interrupts = <14>;

       shutdown-gpios = <&gpio1 15 0>;

Documentation/devicetree/bindings/sound/tas2770.yaml

+4 −2
Original line number Diff line number Diff line
@@ -57,7 +57,9 @@ properties: 
      - 1 # Falling edge



  '#sound-dai-cells':

    const: 1

    # The codec has a single DAI, the #sound-dai-cells=<1>; case is left in for backward

    # compatibility but is deprecated.

    enum: [0, 1]



required:

  - compatible
@@ -74,7 +76,7 @@ examples: 
     codec: codec@41 {

       compatible = "ti,tas2770";

       reg = <0x41>;

       #sound-dai-cells = <1>;

       #sound-dai-cells = <0>;

       interrupt-parent = <&gpio1>;

       interrupts = <14>;

       reset-gpio = <&gpio1 15 0>;

Documentation/devicetree/bindings/sound/tas27xx.yaml

+4 −2
Original line number Diff line number Diff line
@@ -50,7 +50,9 @@ properties: 
    description: TDM TX voltage sense time slot.



  '#sound-dai-cells':

    const: 1

    # The codec has a single DAI, the #sound-dai-cells=<1>; case is left in for backward

    # compatibility but is deprecated.

    enum: [0, 1]



required:

  - compatible
@@ -67,7 +69,7 @@ examples: 
     codec: codec@38 {

       compatible = "ti,tas2764";

       reg = <0x38>;

       #sound-dai-cells = <1>;

       #sound-dai-cells = <0>;

       interrupt-parent = <&gpio1>;

       interrupts = <14>;

       reset-gpios = <&gpio1 15 0>;

MAINTAINERS

+1 −3
Original line number Diff line number Diff line
@@ -4909,7 +4909,6 @@ F: drivers/media/cec/i2c/ch7322.c 
CIRRUS LOGIC AUDIO CODEC DRIVERS

M:	James Schulman <james.schulman@cirrus.com>

M:	David Rhodes <david.rhodes@cirrus.com>

M:	Lucas Tanure <tanureal@opensource.cirrus.com>

M:	Richard Fitzgerald <rf@opensource.cirrus.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

L:	patches@opensource.cirrus.com
@@ -18574,10 +18573,9 @@ F: Documentation/admin-guide/LSM/SafeSetID.rst 
F:	security/safesetid/









SAMSUNG AUDIO (ASoC) DRIVERS









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Sylwester Nawrocki <s.nawrocki@samsung.com>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)









S:	Supported









S:	Maintained









B:	mailto:linux-samsung-soc@vger.kernel.org









F:	Documentation/devicetree/bindings/sound/samsung*









F:	sound/soc/samsung/

























include/sound/hda-mlink.h



+14
−0






























Original line number
Diff line number
Diff line







@@ -44,6 +44,9 @@ int hdac_bus_eml_sdw_power_down_unlocked(struct hdac_bus *bus, int sublink);

















int hdac_bus_eml_sdw_set_lsdiid(struct hdac_bus *bus, int sublink, int dev_num);



















int hdac_bus_eml_sdw_map_stream_ch(struct hdac_bus *bus, int sublink, int y,









				   int channel_mask, int stream_id, int dir);



















void hda_bus_ml_put_all(struct hdac_bus *bus);









void hda_bus_ml_reset_losidv(struct hdac_bus *bus);









int hda_bus_ml_resume(struct hdac_bus *bus);








@@ -51,6 +54,7 @@ int hda_bus_ml_suspend(struct hdac_bus *bus);

















struct hdac_ext_link *hdac_bus_eml_ssp_get_hlink(struct hdac_bus *bus);









struct hdac_ext_link *hdac_bus_eml_dmic_get_hlink(struct hdac_bus *bus);









struct hdac_ext_link *hdac_bus_eml_sdw_get_hlink(struct hdac_bus *bus);



















struct mutex *hdac_bus_eml_get_mutex(struct hdac_bus *bus, bool alt, int elid);


















@@ -144,6 +148,13 @@ hdac_bus_eml_sdw_power_down_unlocked(struct hdac_bus *bus, int sublink) { return







static inline int









hdac_bus_eml_sdw_set_lsdiid(struct hdac_bus *bus, int sublink, int dev_num) { return 0; }



















static inline int









hdac_bus_eml_sdw_map_stream_ch(struct hdac_bus *bus, int sublink, int y,









			       int channel_mask, int stream_id, int dir)









{









	return 0;









}



















static inline void hda_bus_ml_put_all(struct hdac_bus *bus) { }









static inline void hda_bus_ml_reset_losidv(struct hdac_bus *bus) { }









static inline int hda_bus_ml_resume(struct hdac_bus *bus) { return 0; }








@@ -155,6 +166,9 @@ hdac_bus_eml_ssp_get_hlink(struct hdac_bus *bus) { return NULL; }







static inline struct hdac_ext_link *









hdac_bus_eml_dmic_get_hlink(struct hdac_bus *bus) { return NULL; }



















static inline struct hdac_ext_link *









hdac_bus_eml_sdw_get_hlink(struct hdac_bus *bus) { return NULL; }



















static inline struct mutex *









hdac_bus_eml_get_mutex(struct hdac_bus *bus, bool alt, int elid) { return NULL; }