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

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

Pull sound fixes from Takashi Iwai:
 "Lots of small fixes at this time since we've received the ASoC fix
  batch now.

   - Some coverage in ASoC core mostly for minor issues like NULL checks
     for DPCM and proper error handling in DAI instantiation

   - A collection of small device-specific changes in various ASoC codec
     and platform drivers

   - OF-tree refcount fixes in a few ASoC drivers

   - Fixes of memory leaks in the error paths of various ASoC / ALSA
     drivers

   - A workaround for a long-standing issue on AMD HD-audio device

   - Updates of MAINTAINERS, mail addresses, file permission fixups"

* tag 'sound-5.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (38 commits)
  ALSA: firewire: fix a memory leak bug
  sound: fix a memory leak bug
  ALSA: hda - Workaround for crackled sound on AMD controller (1022:1457)
  ALSA: hiface: fix multiple memory leak bugs
  ALSA: hda - Don't override global PCM hw info flag
  ALSA: usb-audio: fix a memory leak bug
  ASoC: max98373: Remove executable bits
  ASoC: amd: acp3x: use dma address for acp3x dma driver
  ASoC: amd: acp3x: use dma_ops of parent device for acp3x dma driver
  ASoC: max98373: add 88200 and 96000 sampling rate support
  ASoC: sun4i-i2s: Incorrect SR and WSS computation
  MAINTAINERS: Update Intel ASoC drivers maintainers
  ASoC: ti: davinci-mcasp: Correct slot_width posed constraint
  ASoC: rockchip: Fix mono capture
  ASoC: Intel: Fix some acpi vs apci typo in somme comments
  ASoC: ti: davinci-mcasp: Fix clk PDIR handling for i2s master mode
  ASoC: Fail card instantiation if DAI format setup fails
  ASoC: SOF: Intel: hda: remove misleading error trace from IRQ thread
  ASoC: qcom: apq8016_sbc: Fix oops with multiple DAI links
  ASoC: dapm: fix a memory leak bug
  ...
parents 6c02b630 1be3c1fa

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -8042,6 +8042,7 @@ S: Maintained 
F:	drivers/video/fbdev/i810/



INTEL ASoC DRIVERS

M:	Cezary Rojewski <cezary.rojewski@intel.com>

M:	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

M:	Liam Girdwood <liam.r.girdwood@linux.intel.com>

M:	Jie Yang <yang.jie@linux.intel.com>
@@ -16084,7 +16085,7 @@ S: Maintained 
F:	drivers/net/ethernet/ti/netcp*



TI PCM3060 ASoC CODEC DRIVER

M:	Kirill Marinushkin <kmarinushkin@birdec.tech>

M:	Kirill Marinushkin <kmarinushkin@birdec.com>

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

S:	Maintained

F:	Documentation/devicetree/bindings/sound/pcm3060.txt

include/sound/simple_card_utils.h

+4 −0
Original line number Diff line number Diff line
@@ -141,6 +141,10 @@ inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, 
{

	struct device *dev = simple_priv_to_dev(priv);



	/* dai might be NULL */

	if (!dai)

		return;



	if (dai->name)

		dev_dbg(dev, "%s dai name = %s\n",

			name, dai->name);

include/uapi/sound/sof/fw.h

+9 −7
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#ifndef __INCLUDE_UAPI_SOF_FW_H__

#define __INCLUDE_UAPI_SOF_FW_H__



#include <linux/types.h>



#define SND_SOF_FW_SIG_SIZE	4

#define SND_SOF_FW_ABI		1

#define SND_SOF_FW_SIG		"Reef"
@@ -46,8 +48,8 @@ enum snd_sof_fw_blk_type { 


struct snd_sof_blk_hdr {

	enum snd_sof_fw_blk_type type;

	uint32_t size;		/* bytes minus this header */

	uint32_t offset;	/* offset from base */

	__u32 size;		/* bytes minus this header */

	__u32 offset;		/* offset from base */

} __packed;



/*
@@ -61,8 +63,8 @@ enum snd_sof_fw_mod_type { 


struct snd_sof_mod_hdr {

	enum snd_sof_fw_mod_type type;

	uint32_t size;		/* bytes minus this header */

	uint32_t num_blocks;	/* number of blocks */

	__u32 size;		/* bytes minus this header */

	__u32 num_blocks;	/* number of blocks */

} __packed;



/*
@@ -70,9 +72,9 @@ struct snd_sof_mod_hdr { 
 */

struct snd_sof_fw_header {

	unsigned char sig[SND_SOF_FW_SIG_SIZE]; /* "Reef" */

	uint32_t file_size;	/* size of file minus this header */

	uint32_t num_modules;	/* number of modules */

	uint32_t abi;		/* version of header format */

	__u32 file_size;	/* size of file minus this header */

	__u32 num_modules;	/* number of modules */

	__u32 abi;		/* version of header format */

} __packed;



#endif

include/uapi/sound/sof/header.h

+8 −6
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#ifndef __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__

#define __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__



#include <linux/types.h>



/*

 * Header for all non IPC ABI data.

 *
@@ -16,12 +18,12 @@ 
 * Used by any bespoke component data structures or binary blobs.

 */

struct sof_abi_hdr {

	uint32_t magic;		/**< 'S', 'O', 'F', '\0' */

	uint32_t type;		/**< component specific type */

	uint32_t size;		/**< size in bytes of data excl. this struct */

	uint32_t abi;		/**< SOF ABI version */

	uint32_t reserved[4];	/**< reserved for future use */

	uint32_t data[0];	/**< Component data - opaque to core */

	__u32 magic;		/**< 'S', 'O', 'F', '\0' */

	__u32 type;		/**< component specific type */

	__u32 size;		/**< size in bytes of data excl. this struct */

	__u32 abi;		/**< SOF ABI version */

	__u32 reserved[4];	/**< reserved for future use */

	__u32 data[0];		/**< Component data - opaque to core */

}  __packed;



#endif

sound/firewire/packets-buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ int iso_packets_buffer_init(struct iso_packets_buffer *b, struct fw_unit *unit, 
	packets_per_page = PAGE_SIZE / packet_size;

	if (WARN_ON(!packets_per_page)) {

		err = -EINVAL;

		goto error;

		goto err_packets;

	}

	pages = DIV_ROUND_UP(count, packets_per_page);

CRA Git | Maintained and supported by SUSTech CRA and CCSE