Commit dae02c8c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Pull 5.3 development branch for further fixes of USB-audio stuff.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 74f94e41 a6706020

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -8044,6 +8044,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>
@@ -16078,7 +16079,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/compress_driver.h

+1 −4
Original line number Diff line number Diff line
@@ -173,10 +173,7 @@ static inline void snd_compr_drain_notify(struct snd_compr_stream *stream) 
	if (snd_BUG_ON(!stream))

		return;



	if (stream->direction == SND_COMPRESS_PLAYBACK)

	stream->runtime->state = SNDRV_PCM_STATE_SETUP;

	else

		stream->runtime->state = SNDRV_PCM_STATE_PREPARED;



	wake_up(&stream->runtime->sleep);

}

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