Commit 7f3c8f91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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)
  ...
parents 9551a26f fd324768

Documentation/devicetree/bindings/sound/cirrus,cs42xx8.yaml

+4 −1
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ title: Cirrus Logic CS42448/CS42888 audio CODEC 
maintainers:

  - patches@opensource.cirrus.com



allOf:

  - $ref: dai-common.yaml#



properties:

  compatible:

    enum:
@@ -63,7 +66,7 @@ then: 
    - VLC-supply

    - VLS-supply



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/sound/cix,sky1-ipbloq-hda.yaml

0 → 100644
+62 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/cix,sky1-ipbloq-hda.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: CIX IPBLOQ HDA controller



description:

  CIX IPBLOQ High Definition Audio (HDA) Controller



maintainers:

  - Joakim Zhang <joakim.zhang@cixtech.com>



allOf:

  - $ref: sound-card-common.yaml#



properties:

  compatible:

    const: cix,sky1-ipbloq-hda



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 2



  clock-names:

    items:

      - const: ipg

      - const: per



  resets:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names

  - resets



unevaluatedProperties: false



examples:

  - |

    #include<dt-bindings/interrupt-controller/arm-gic.h>



    hda@70c0000 {

        compatible = "cix,sky1-ipbloq-hda";

        reg = <0x70c0000 0x10000>;

        interrupts = <GIC_SPI 234 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&audss_clk 7>,

                 <&audss_clk 8>;

        clock-names = "ipg", "per";

        resets = <&audss_rst 14>;

        model = "CIX SKY1 EVB HDA";

    };

arch/arm/configs/am200epdkit_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ CONFIG_SOUND=m 
CONFIG_SND=m

CONFIG_SND_MIXER_OSS=m

CONFIG_SND_PCM_OSS=m

# CONFIG_SND_SUPPORT_OLD_API is not set

# CONFIG_SND_VERBOSE_PROCFS is not set

CONFIG_SND_PXA2XX_AC97=m

CONFIG_USB_GADGET=y

arch/arm/configs/lpc32xx_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ CONFIG_LOGO=y 
# CONFIG_LOGO_LINUX_VGA16 is not set

CONFIG_SOUND=y

CONFIG_SND=y

# CONFIG_SND_SUPPORT_OLD_API is not set

# CONFIG_SND_VERBOSE_PROCFS is not set

CONFIG_SND_DEBUG=y

CONFIG_SND_DEBUG_VERBOSE=y

arch/arm/configs/omap1_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ CONFIG_SOUND=y 
CONFIG_SND=y

CONFIG_SND_MIXER_OSS=y

CONFIG_SND_PCM_OSS=y

# CONFIG_SND_SUPPORT_OLD_API is not set

# CONFIG_SND_VERBOSE_PROCFS is not set

CONFIG_SND_DUMMY=y

CONFIG_SND_USB_AUDIO=y