Skip to content

Commit bc1d4e7

Browse files
committed
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 ...
2 parents d4a292c + 89339d8 commit bc1d4e7

57 files changed

Lines changed: 248 additions & 531 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ properties:
2121
reg:
2222
maxItems: 1
2323

24-
avdd-supply:
24+
AVDD-supply:
2525
description: Analog power supply
2626

27-
dvdd-supply:
27+
DVDD-supply:
2828
description: Digital power supply
2929

3030
reset-gpios:
@@ -60,7 +60,7 @@ allOf:
6060
properties:
6161
dsd-path: false
6262

63-
additionalProperties: false
63+
unevaluatedProperties: false
6464

6565
examples:
6666
- |

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ properties:
1919
reg:
2020
maxItems: 1
2121

22-
avdd-supply:
22+
AVDD-supply:
2323
description: A 1.8V supply that powers up the AVDD pin.
2424

25-
dvdd-supply:
25+
DVDD-supply:
2626
description: A 1.2V supply that powers up the DVDD pin.
2727

2828
reset-gpios:
@@ -32,7 +32,10 @@ required:
3232
- compatible
3333
- reg
3434

35-
additionalProperties: false
35+
allOf:
36+
- $ref: dai-common.yaml#
37+
38+
unevaluatedProperties: false
3639

3740
examples:
3841
- |

sound/core/oss/copy.c

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
1+
// SPDX-License-Identifier: LGPL-2.0+
12
/*
23
* Linear conversion Plug-In
34
* Copyright (c) 2000 by Abramo Bagnara <abramo@alsa-project.org>
4-
*
5-
*
6-
* This library is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU Library General Public License as
8-
* published by the Free Software Foundation; either version 2 of
9-
* the License, or (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU Library General Public License for more details.
15-
*
16-
* You should have received a copy of the GNU Library General Public
17-
* License along with this library; if not, write to the Free Software
18-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19-
*
205
*/
216

227
#include <linux/time.h>

sound/core/oss/io.c

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
1+
// SPDX-License-Identifier: LGPL-2.0+
12
/*
23
* PCM I/O Plug-In Interface
34
* Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
4-
*
5-
*
6-
* This library is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU Library General Public License as
8-
* published by the Free Software Foundation; either version 2 of
9-
* the License, or (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU Library General Public License for more details.
15-
*
16-
* You should have received a copy of the GNU Library General Public
17-
* License along with this library; if not, write to the Free Software
18-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19-
*
205
*/
216

227
#include <linux/time.h>

sound/core/oss/linear.c

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,8 @@
1+
// SPDX-License-Identifier: LGPL-2.0+
12
/*
23
* Linear conversion Plug-In
34
* Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>,
45
* Abramo Bagnara <abramo@alsa-project.org>
5-
*
6-
*
7-
* This library is free software; you can redistribute it and/or modify
8-
* it under the terms of the GNU Library General Public License as
9-
* published by the Free Software Foundation; either version 2 of
10-
* the License, or (at your option) any later version.
11-
*
12-
* This program is distributed in the hope that it will be useful,
13-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
* GNU Library General Public License for more details.
16-
*
17-
* You should have received a copy of the GNU Library General Public
18-
* License along with this library; if not, write to the Free Software
19-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20-
*
216
*/
227

238
#include <linux/time.h>

sound/core/oss/mulaw.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,10 @@
1+
// SPDX-License-Identifier: LGPL-2.0+
12
/*
23
* Mu-Law conversion Plug-In Interface
34
* Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
45
* Uros Bizjak <uros@kss-loka.si>
56
*
67
* Based on reference implementation by Sun Microsystems, Inc.
7-
*
8-
* This library is free software; you can redistribute it and/or modify
9-
* it under the terms of the GNU Library General Public License as
10-
* published by the Free Software Foundation; either version 2 of
11-
* the License, or (at your option) any later version.
12-
*
13-
* This program is distributed in the hope that it will be useful,
14-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
* GNU Library General Public License for more details.
17-
*
18-
* You should have received a copy of the GNU Library General Public
19-
* License along with this library; if not, write to the Free Software
20-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21-
*
228
*/
239

2410
#include <linux/time.h>

sound/core/oss/pcm_plugin.c

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,8 @@
1+
// SPDX-License-Identifier: LGPL-2.0+
12
/*
23
* PCM Plug-In shared (kernel/library) code
34
* Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
45
* Copyright (c) 2000 by Abramo Bagnara <abramo@alsa-project.org>
5-
*
6-
*
7-
* This library is free software; you can redistribute it and/or modify
8-
* it under the terms of the GNU Library General Public License as
9-
* published by the Free Software Foundation; either version 2 of
10-
* the License, or (at your option) any later version.
11-
*
12-
* This program is distributed in the hope that it will be useful,
13-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
* GNU Library General Public License for more details.
16-
*
17-
* You should have received a copy of the GNU Library General Public
18-
* License along with this library; if not, write to the Free Software
19-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20-
*
216
*/
227

238
#if 0

sound/core/oss/rate.c

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
1+
// SPDX-License-Identifier: LGPL-2.0+
12
/*
23
* Rate conversion Plug-In
34
* Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
4-
*
5-
*
6-
* This library is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU Library General Public License as
8-
* published by the Free Software Foundation; either version 2 of
9-
* the License, or (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU Library General Public License for more details.
15-
*
16-
* You should have received a copy of the GNU Library General Public
17-
* License along with this library; if not, write to the Free Software
18-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19-
*
205
*/
216

227
#include <linux/time.h>

sound/core/oss/route.c

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
1+
// SPDX-License-Identifier: LGPL-2.0+
12
/*
23
* Route Plug-In
34
* Copyright (c) 2000 by Abramo Bagnara <abramo@alsa-project.org>
4-
*
5-
*
6-
* This library is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU Library General Public License as
8-
* published by the Free Software Foundation; either version 2 of
9-
* the License, or (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU Library General Public License for more details.
15-
*
16-
* You should have received a copy of the GNU Library General Public
17-
* License along with this library; if not, write to the Free Software
18-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19-
*
205
*/
216

227
#include <linux/time.h>

sound/core/pcm_misc.c

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
1+
// SPDX-License-Identifier: LGPL-2.0+
12
/*
23
* PCM Interface - misc routines
34
* Copyright (c) 1998 by Jaroslav Kysela <perex@perex.cz>
4-
*
5-
*
6-
* This library is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU Library General Public License as
8-
* published by the Free Software Foundation; either version 2 of
9-
* the License, or (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU Library General Public License for more details.
15-
*
16-
* You should have received a copy of the GNU Library General Public
17-
* License along with this library; if not, write to the Free Software
18-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19-
*
205
*/
21-
6+
227
#include <linux/time.h>
238
#include <linux/export.h>
249
#include <sound/core.h>

0 commit comments

Comments
 (0)