Commit bc1d4e70 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-fix-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Here are a bunch of updates, but there should be no big surprises;
  mostly device-specific quirks and fix-ups or non-code changes:

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

   - Fixes in ASoC fsl, rockchip, renesas, aw codecs

   - Fixes for USB-audio packet handling in the implicit feedback mode

   - Updates of SPDX license IDs in some files"

* tag 'sound-fix-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (28 commits)
  ASoC: rockchip: i2s-tdm: Use param rate if not provided by set_sysclk
  ALSA: hda/hdmi: Add quirk for TUXEDO IBS14G6
  ASoC: dt-bindings: asahi-kasei,ak5558: Fix the supply names
  ASoC: dt-bindings: asahi-kasei,ak4458: Fix the supply names
  ASoC: dt-bindings: asahi-kasei,ak4458: set unevaluatedProperties:false
  ASoC: amd: amd_sdw: add machine driver quirk for Lenovo models
  ASoC: amd: acp: Add ACP7.0 match entries for Realtek parts
  ALSA: echoaudio: Add SPDX ids to some files
  ALSA: isa: Add SPDX id lines to some files
  ALSA: core: Add SPDX license id to files
  ASoC: tas2783A: add explicit port prepare handling
  ASoC: renesas: rz-ssi: Fix playback and capture
  ALSA: hda/realtek: Fix headset mic on ASUS Zenbook 14 UX3405MA
  ALSA: hda/conexant: Fix headphone jack handling on Acer Swift SF314
  ASoC: qcom: sm8250: Add quinary MI2S support
  ASoC: amd: yc: Add DMI quirk for ASUS Vivobook Pro 15X M6501RR
  ALSA: usb-audio: Avoid potentially repeated XRUN error messages
  ALSA: usb-audio: Add sanity check for OOB writes at silencing
  ALSA: usb-audio: Optimize the copy of packet sizes for implicit fb handling
  ALSA: usb-audio: Update the number of packets properly at receiving
  ...
parents d4a292c5 89339d88

Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml

+3 −3
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ properties: 
  reg:

    maxItems: 1



  avdd-supply:

  AVDD-supply:

    description: Analog power supply



  dvdd-supply:

  DVDD-supply:

    description: Digital power supply



  reset-gpios:
@@ -60,7 +60,7 @@ allOf: 
      properties:

        dsd-path: false



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml

+6 −3
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ properties: 
  reg:

    maxItems: 1



  avdd-supply:

  AVDD-supply:

    description: A 1.8V supply that powers up the AVDD pin.



  dvdd-supply:

  DVDD-supply:

    description: A 1.2V supply that powers up the DVDD pin.



  reset-gpios:
@@ -32,7 +32,10 @@ required: 
  - compatible

  - reg



additionalProperties: false

allOf:

  - $ref: dai-common.yaml#



unevaluatedProperties: false



examples:

  - |

sound/core/oss/copy.c

+1 −16
Original line number Diff line number Diff line 
// SPDX-License-Identifier: LGPL-2.0+

/*

 *  Linear conversion Plug-In

 *  Copyright (c) 2000 by Abramo Bagnara <abramo@alsa-project.org>

 *

 *

 *   This library is free software; you can redistribute it and/or modify

 *   it under the terms of the GNU Library General Public License as

 *   published by the Free Software Foundation; either version 2 of

 *   the License, or (at your option) any later version.

 *

 *   This program is distributed in the hope that it will be useful,

 *   but WITHOUT ANY WARRANTY; without even the implied warranty of

 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *   GNU Library General Public License for more details.

 *

 *   You should have received a copy of the GNU Library General Public

 *   License along with this library; if not, write to the Free Software

 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

 *

 */



#include <linux/time.h>

sound/core/oss/io.c

+1 −16
Original line number Diff line number Diff line 
// SPDX-License-Identifier: LGPL-2.0+

/*

 *  PCM I/O Plug-In Interface

 *  Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>

 *

 *

 *   This library is free software; you can redistribute it and/or modify

 *   it under the terms of the GNU Library General Public License as

 *   published by the Free Software Foundation; either version 2 of

 *   the License, or (at your option) any later version.

 *

 *   This program is distributed in the hope that it will be useful,

 *   but WITHOUT ANY WARRANTY; without even the implied warranty of

 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *   GNU Library General Public License for more details.

 *

 *   You should have received a copy of the GNU Library General Public

 *   License along with this library; if not, write to the Free Software

 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

 *

 */

  

#include <linux/time.h>

sound/core/oss/linear.c

+1 −16
Original line number Diff line number Diff line 
// SPDX-License-Identifier: LGPL-2.0+

/*

 *  Linear conversion Plug-In

 *  Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>,

 *			  Abramo Bagnara <abramo@alsa-project.org>

 *

 *

 *   This library is free software; you can redistribute it and/or modify

 *   it under the terms of the GNU Library General Public License as

 *   published by the Free Software Foundation; either version 2 of

 *   the License, or (at your option) any later version.

 *

 *   This program is distributed in the hope that it will be useful,

 *   but WITHOUT ANY WARRANTY; without even the implied warranty of

 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *   GNU Library General Public License for more details.

 *

 *   You should have received a copy of the GNU Library General Public

 *   License along with this library; if not, write to the Free Software

 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

 *

 */



#include <linux/time.h>