Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16cf45c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "No excitement, here are only minor fixes: an endian fix for the new
  DSD format we added in 3.18, a fix for HP mute LED, and a fix for
  Native Instrument quirk"

* tag 'sound-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: pcm: Add big-endian DSD sample formats and fix XMOS DSD sample format
  ALSA: hda - One more HP machine needs to change mute led quirk
  ALSA: usb-audio: Use snd_usb_ctl_msg() for Native Instruments quirk
parents 615b994e d42472ec

include/sound/pcm.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -184,6 +184,8 @@ struct snd_pcm_ops { 
#define SNDRV_PCM_FMTBIT_DSD_U8		_SNDRV_PCM_FMTBIT(DSD_U8)

#define SNDRV_PCM_FMTBIT_DSD_U8		_SNDRV_PCM_FMTBIT(DSD_U8)

#define SNDRV_PCM_FMTBIT_DSD_U16_LE	_SNDRV_PCM_FMTBIT(DSD_U16_LE)

#define SNDRV_PCM_FMTBIT_DSD_U16_LE	_SNDRV_PCM_FMTBIT(DSD_U16_LE)

#define SNDRV_PCM_FMTBIT_DSD_U32_LE	_SNDRV_PCM_FMTBIT(DSD_U32_LE)

#define SNDRV_PCM_FMTBIT_DSD_U32_LE	_SNDRV_PCM_FMTBIT(DSD_U32_LE)

#define SNDRV_PCM_FMTBIT_DSD_U16_BE	_SNDRV_PCM_FMTBIT(DSD_U16_BE)

#define SNDRV_PCM_FMTBIT_DSD_U32_BE	_SNDRV_PCM_FMTBIT(DSD_U32_BE)





#ifdef SNDRV_LITTLE_ENDIAN

#ifdef SNDRV_LITTLE_ENDIAN

#define SNDRV_PCM_FMTBIT_S16		SNDRV_PCM_FMTBIT_S16_LE

#define SNDRV_PCM_FMTBIT_S16		SNDRV_PCM_FMTBIT_S16_LE

include/uapi/sound/asound.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -220,7 +220,9 @@ typedef int __bitwise snd_pcm_format_t; 
#define	SNDRV_PCM_FORMAT_DSD_U8		((__force snd_pcm_format_t) 48) /* DSD, 1-byte samples DSD (x8) */

#define	SNDRV_PCM_FORMAT_DSD_U8		((__force snd_pcm_format_t) 48) /* DSD, 1-byte samples DSD (x8) */

#define	SNDRV_PCM_FORMAT_DSD_U16_LE	((__force snd_pcm_format_t) 49) /* DSD, 2-byte samples DSD (x16), little endian */

#define	SNDRV_PCM_FORMAT_DSD_U16_LE	((__force snd_pcm_format_t) 49) /* DSD, 2-byte samples DSD (x16), little endian */

#define	SNDRV_PCM_FORMAT_DSD_U32_LE	((__force snd_pcm_format_t) 50) /* DSD, 4-byte samples DSD (x32), little endian */

#define	SNDRV_PCM_FORMAT_DSD_U32_LE	((__force snd_pcm_format_t) 50) /* DSD, 4-byte samples DSD (x32), little endian */

#define	SNDRV_PCM_FORMAT_LAST		SNDRV_PCM_FORMAT_DSD_U32_LE

#define	SNDRV_PCM_FORMAT_DSD_U16_BE	((__force snd_pcm_format_t) 51) /* DSD, 2-byte samples DSD (x16), big endian */

#define	SNDRV_PCM_FORMAT_DSD_U32_BE	((__force snd_pcm_format_t) 52) /* DSD, 4-byte samples DSD (x32), big endian */

#define	SNDRV_PCM_FORMAT_LAST		SNDRV_PCM_FORMAT_DSD_U32_BE





#ifdef SNDRV_LITTLE_ENDIAN

#ifdef SNDRV_LITTLE_ENDIAN

#define	SNDRV_PCM_FORMAT_S16		SNDRV_PCM_FORMAT_S16_LE

#define	SNDRV_PCM_FORMAT_S16		SNDRV_PCM_FORMAT_S16_LE

sound/core/pcm.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -216,6 +216,8 @@ static char *snd_pcm_format_names[] = { 
	FORMAT(DSD_U8),

	FORMAT(DSD_U8),

	FORMAT(DSD_U16_LE),

	FORMAT(DSD_U16_LE),

	FORMAT(DSD_U32_LE),

	FORMAT(DSD_U32_LE),

	FORMAT(DSD_U16_BE),

	FORMAT(DSD_U32_BE),

};

};





const char *snd_pcm_format_name(snd_pcm_format_t format)

const char *snd_pcm_format_name(snd_pcm_format_t format)

sound/core/pcm_misc.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -152,6 +152,14 @@ static struct pcm_format_data pcm_formats[(INT)SNDRV_PCM_FORMAT_LAST+1] = { 
		.width = 32, .phys = 32, .le = 1, .signd = 0,

		.width = 32, .phys = 32, .le = 1, .signd = 0,

		.silence = { 0x69, 0x69, 0x69, 0x69 },

		.silence = { 0x69, 0x69, 0x69, 0x69 },

	},

	},

	[SNDRV_PCM_FORMAT_DSD_U16_BE] = {

		.width = 16, .phys = 16, .le = 0, .signd = 0,

		.silence = { 0x69, 0x69 },

	},

	[SNDRV_PCM_FORMAT_DSD_U32_BE] = {

		.width = 32, .phys = 32, .le = 0, .signd = 0,

		.silence = { 0x69, 0x69, 0x69, 0x69 },

	},

	/* FIXME: the following three formats are not defined properly yet */

	/* FIXME: the following three formats are not defined properly yet */

	[SNDRV_PCM_FORMAT_MPEG] = {

	[SNDRV_PCM_FORMAT_MPEG] = {

		.le = -1, .signd = -1,

		.le = -1, .signd = -1,

sound/pci/hda/patch_realtek.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -4818,7 +4818,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x221b, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),

	SND_PCI_QUIRK(0x103c, 0x221b, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),

	SND_PCI_QUIRK(0x103c, 0x2221, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),

	SND_PCI_QUIRK(0x103c, 0x2221, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),

	SND_PCI_QUIRK(0x103c, 0x2225, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),

	SND_PCI_QUIRK(0x103c, 0x2225, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),

	SND_PCI_QUIRK(0x103c, 0x2246, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),

	SND_PCI_QUIRK(0x103c, 0x2253, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),

	SND_PCI_QUIRK(0x103c, 0x2253, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),

	SND_PCI_QUIRK(0x103c, 0x2254, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),

	SND_PCI_QUIRK(0x103c, 0x2254, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),

	SND_PCI_QUIRK(0x103c, 0x2255, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),

	SND_PCI_QUIRK(0x103c, 0x2255, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),