Skip to content

Commit 7f3c8f9

Browse files
committed
Merge tag 'sound-fix-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "The only slightly large change is the enablement of CIX HD-audio controller, which took a bit time to be cooked up, while most of other changes are device-specific small trivial fixes: - Default disablement of the kconfig for decades old pre-release alsa-lib PCM API; it's only the default config value change, so it can't lead to any regressions for the existing setups - Support for CIX HD-audio controller - A few ASoC ACP fixes - Fixes for ASoC cirrus, bcm, wcd, qcom, ak platforms - Trivial hardening for FireWire and USB-audio - HD-audio Intel binding fix and quirks" * tag 'sound-fix-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (30 commits) ALSA: hda/tas2781: Add new quirk for HP new project ALSA: hda: cix-ipbloq: Use modern PM ops ALSA: hda: intel-dsp-config: Prefer legacy driver as fallback ASoC: amd: acp: update tdm channels for specific DAI ASoC: cs35l56: Fix incorrect select SND_SOC_CS35L56_CAL_SYSFS_COMMON ALSA: firewire-motu: add bounds check in put_user loop for DSP events ASoC: cs35l41: Always return 0 when a subsystem ID is found ALSA: uapi: Fix typo in asound.h comment ALSA: Do not build obsolete API ALSA: hda: add CIX IPBLOQ HDA controller support ALSA: hda/core: add addr_offset field for bus address translation ALSA: hda: dt-bindings: add CIX IPBLOQ HDA controller support ALSA: hda/realtek: Add support for ASUS UM3406GA ALSA: hda/realtek: Add support for HP Turbine Laptops ALSA: usb-audio: Initialize status1 to fix uninitialized symbol errors ALSA: firewire-motu: fix buffer overflow in hwdep read for DSP events ALSA: hda: cs35l41: Fix NULL pointer dereference in cs35l41_hda_read_acpi() ASoC: cros_ec_codec: Remove unnecessary selection of CRYPTO ASoc: qcom: q6afe: fix bad guard conversion ASoC: rockchip: Fix Wvoid-pointer-to-enum-cast warning (again) ...
2 parents 9551a26 + fd32476 commit 7f3c8f9

46 files changed

Lines changed: 626 additions & 71 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/cirrus,cs42xx8.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ title: Cirrus Logic CS42448/CS42888 audio CODEC
99
maintainers:
1010
- patches@opensource.cirrus.com
1111

12+
allOf:
13+
- $ref: dai-common.yaml#
14+
1215
properties:
1316
compatible:
1417
enum:
@@ -63,7 +66,7 @@ then:
6366
- VLC-supply
6467
- VLS-supply
6568

66-
additionalProperties: false
69+
unevaluatedProperties: false
6770

6871
examples:
6972
- |
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/cix,sky1-ipbloq-hda.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: CIX IPBLOQ HDA controller
8+
9+
description:
10+
CIX IPBLOQ High Definition Audio (HDA) Controller
11+
12+
maintainers:
13+
- Joakim Zhang <joakim.zhang@cixtech.com>
14+
15+
allOf:
16+
- $ref: sound-card-common.yaml#
17+
18+
properties:
19+
compatible:
20+
const: cix,sky1-ipbloq-hda
21+
22+
reg:
23+
maxItems: 1
24+
25+
interrupts:
26+
maxItems: 1
27+
28+
clocks:
29+
maxItems: 2
30+
31+
clock-names:
32+
items:
33+
- const: ipg
34+
- const: per
35+
36+
resets:
37+
maxItems: 1
38+
39+
required:
40+
- compatible
41+
- reg
42+
- interrupts
43+
- clocks
44+
- clock-names
45+
- resets
46+
47+
unevaluatedProperties: false
48+
49+
examples:
50+
- |
51+
#include<dt-bindings/interrupt-controller/arm-gic.h>
52+
53+
hda@70c0000 {
54+
compatible = "cix,sky1-ipbloq-hda";
55+
reg = <0x70c0000 0x10000>;
56+
interrupts = <GIC_SPI 234 IRQ_TYPE_LEVEL_HIGH>;
57+
clocks = <&audss_clk 7>,
58+
<&audss_clk 8>;
59+
clock-names = "ipg", "per";
60+
resets = <&audss_rst 14>;
61+
model = "CIX SKY1 EVB HDA";
62+
};

arch/arm/configs/am200epdkit_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ CONFIG_SOUND=m
6868
CONFIG_SND=m
6969
CONFIG_SND_MIXER_OSS=m
7070
CONFIG_SND_PCM_OSS=m
71-
# CONFIG_SND_SUPPORT_OLD_API is not set
7271
# CONFIG_SND_VERBOSE_PROCFS is not set
7372
CONFIG_SND_PXA2XX_AC97=m
7473
CONFIG_USB_GADGET=y

arch/arm/configs/lpc32xx_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ CONFIG_LOGO=y
113113
# CONFIG_LOGO_LINUX_VGA16 is not set
114114
CONFIG_SOUND=y
115115
CONFIG_SND=y
116-
# CONFIG_SND_SUPPORT_OLD_API is not set
117116
# CONFIG_SND_VERBOSE_PROCFS is not set
118117
CONFIG_SND_DEBUG=y
119118
CONFIG_SND_DEBUG_VERBOSE=y

arch/arm/configs/omap1_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ CONFIG_SOUND=y
148148
CONFIG_SND=y
149149
CONFIG_SND_MIXER_OSS=y
150150
CONFIG_SND_PCM_OSS=y
151-
# CONFIG_SND_SUPPORT_OLD_API is not set
152151
# CONFIG_SND_VERBOSE_PROCFS is not set
153152
CONFIG_SND_DUMMY=y
154153
CONFIG_SND_USB_AUDIO=y

arch/arm/configs/tegra_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
219219
CONFIG_LOGO=y
220220
CONFIG_SOUND=y
221221
CONFIG_SND=y
222-
# CONFIG_SND_SUPPORT_OLD_API is not set
223222
# CONFIG_SND_DRIVERS is not set
224223
CONFIG_SND_HDA_TEGRA=y
225224
CONFIG_SND_HDA_INPUT_BEEP=y

arch/mips/configs/gcw0_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ CONFIG_LOGO=y
7979
# CONFIG_LOGO_LINUX_VGA16 is not set
8080
CONFIG_SOUND=y
8181
CONFIG_SND=y
82-
# CONFIG_SND_SUPPORT_OLD_API is not set
8382
# CONFIG_SND_PROC_FS is not set
8483
# CONFIG_SND_DRIVERS is not set
8584
# CONFIG_SND_SPI is not set

arch/mips/configs/loongson1_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ CONFIG_WATCHDOG_SYSFS=y
119119
CONFIG_LOONGSON1_WDT=y
120120
CONFIG_SOUND=y
121121
CONFIG_SND=y
122-
# CONFIG_SND_SUPPORT_OLD_API is not set
123122
# CONFIG_SND_DRIVERS is not set
124123
# CONFIG_SND_MIPS is not set
125124
# CONFIG_SND_USB is not set

arch/mips/configs/qi_lb60_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ CONFIG_LOGO=y
8181
# CONFIG_LOGO_LINUX_CLUT224 is not set
8282
CONFIG_SOUND=y
8383
CONFIG_SND=y
84-
# CONFIG_SND_SUPPORT_OLD_API is not set
8584
# CONFIG_SND_VERBOSE_PROCFS is not set
8685
# CONFIG_SND_DRIVERS is not set
8786
# CONFIG_SND_SPI is not set

arch/mips/configs/rbtx49xx_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ CONFIG_TXX9_WDT=m
5353
# CONFIG_VGA_ARB is not set
5454
CONFIG_SOUND=m
5555
CONFIG_SND=m
56-
# CONFIG_SND_SUPPORT_OLD_API is not set
5756
# CONFIG_SND_VERBOSE_PROCFS is not set
5857
# CONFIG_SND_DRIVERS is not set
5958
# CONFIG_SND_PCI is not set

0 commit comments

Comments
 (0)