sound fixes for 3.18-rc7
Linus,
please pull sound fixes for v3.18-rc7 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.18-rc7
The topmost commit is d42472ecffd7c42086c6e5b1335c99a3adf58a09
----------------------------------------------------------------
sound fixes for 3.18-rc7
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.
----------------------------------------------------------------
Hui Wang (1):
ALSA: hda - One more HP machine needs to change mute led quirk
Jussi Laako (1):
ALSA: pcm: Add big-endian DSD sample formats and fix XMOS DSD sample format
Takashi Iwai (1):
ALSA: usb-audio: Use snd_usb_ctl_msg() for Native Instruments quirk
--- include/sound/pcm.h | 2 ++ include/uapi/sound/asound.h | 4 +++- sound/core/pcm.c | 2 ++ sound/core/pcm_misc.c | 8 ++++++++ sound/pci/hda/patch_realtek.c | 1 - sound/usb/mixer_quirks.c | 4 ++-- sound/usb/quirks.c | 4 ++-- 7 files changed, 19 insertions(+), 6 deletions(-)
include/sound/pcm.h +2 -0
@@ -184,6 +184,8 @@ struct snd_pcm_ops {#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_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 #define SNDRV_PCM_FMTBIT_S16 SNDRV_PCM_FMTBIT_S16_LE
include/uapi/sound/asound.h +3 -1
@@ -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_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_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 #define SNDRV_PCM_FORMAT_S16 SNDRV_PCM_FORMAT_S16_LE
sound/core/pcm.c +2 -0
@@ -216,6 +216,8 @@ static char *snd_pcm_format_names[] = {FORMAT (DSD_U8 ),FORMAT (DSD_U16_LE ),FORMAT (DSD_U32_LE ), +FORMAT (DSD_U16_BE ), + FORMAT(DSD_U32_BE), };const char *snd_pcm_format_name (snd_pcm_format_t format)
sound/core/pcm_misc.c +8 -0
@@ -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, .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 */ [SNDRV_PCM_FORMAT_MPEG] = { .le = -1, .signd = -1,
sound/pci/hda/patch_realtek.c +0 -1
@@ -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 ,0x2221 ,"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 ,0x2254 ,"HP" ,ALC269_FIXUP_HP_GPIO_MIC1_LED ), SND_PCI_QUIRK(0x103c, 0x2255, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),
sound/usb/mixer_quirks.c +2 -2
@@ -593,10 +593,10 @@ static int snd_nativeinstruments_control_get(struct snd_kcontrol *kcontrol,if (mixer->chip->shutdown) ret = -ENODEV ;else - ret =usb_control_msg (dev,usb_rcvctrlpipe (dev,0 ), bRequest, + ret =snd_usb_ctl_msg (dev,usb_rcvctrlpipe (dev,0 ), bRequest,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_IN ,0 , wIndex, - &tmp,sizeof (tmp),1000 ); + &tmp,sizeof (tmp));up_read (&mixer->chip->shutdown_rwsem);if (ret <0 ) {
sound/usb/quirks.c +2 -2
@@ -1193,12 +1193,12 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip,/* iFi Audio micro/nano iDSD */ case USB_ID (0x20b1 ,0x3008 ):if (fp->altsetting ==2 ) -return SNDRV_PCM_FMTBIT_DSD_U32_LE ; +return SNDRV_PCM_FMTBIT_DSD_U32_BE ;break ;/* DIYINHK DSD DXD 384kHz USB to I2S/DSD */ case USB_ID (0x20b1 ,0x2009 ):if (fp->altsetting ==3 ) -return SNDRV_PCM_FMTBIT_DSD_U32_LE ; +return SNDRV_PCM_FMTBIT_DSD_U32_BE ;break ;default :break ;