Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+19
-6
+2
include/sound/pcm.h
+2
include/sound/pcm.h
···
184
184
#define SNDRV_PCM_FMTBIT_DSD_U8 _SNDRV_PCM_FMTBIT(DSD_U8)
185
185
#define SNDRV_PCM_FMTBIT_DSD_U16_LE _SNDRV_PCM_FMTBIT(DSD_U16_LE)
186
186
#define SNDRV_PCM_FMTBIT_DSD_U32_LE _SNDRV_PCM_FMTBIT(DSD_U32_LE)
187
+
#define SNDRV_PCM_FMTBIT_DSD_U16_BE _SNDRV_PCM_FMTBIT(DSD_U16_BE)
188
+
#define SNDRV_PCM_FMTBIT_DSD_U32_BE _SNDRV_PCM_FMTBIT(DSD_U32_BE)
187
189
188
190
#ifdef SNDRV_LITTLE_ENDIAN
189
191
#define SNDRV_PCM_FMTBIT_S16 SNDRV_PCM_FMTBIT_S16_LE
+3
-1
include/uapi/sound/asound.h
+3
-1
include/uapi/sound/asound.h
···
220
220
#define SNDRV_PCM_FORMAT_DSD_U8 ((__force snd_pcm_format_t) 48) /* DSD, 1-byte samples DSD (x8) */
221
221
#define SNDRV_PCM_FORMAT_DSD_U16_LE ((__force snd_pcm_format_t) 49) /* DSD, 2-byte samples DSD (x16), little endian */
222
222
#define SNDRV_PCM_FORMAT_DSD_U32_LE ((__force snd_pcm_format_t) 50) /* DSD, 4-byte samples DSD (x32), little endian */
223
-
#define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U32_LE
223
+
#define SNDRV_PCM_FORMAT_DSD_U16_BE ((__force snd_pcm_format_t) 51) /* DSD, 2-byte samples DSD (x16), big endian */
224
+
#define SNDRV_PCM_FORMAT_DSD_U32_BE ((__force snd_pcm_format_t) 52) /* DSD, 4-byte samples DSD (x32), big endian */
225
+
#define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U32_BE
224
226
225
227
#ifdef SNDRV_LITTLE_ENDIAN
226
228
#define SNDRV_PCM_FORMAT_S16 SNDRV_PCM_FORMAT_S16_LE
+2
sound/core/pcm.c
+2
sound/core/pcm.c
+8
sound/core/pcm_misc.c
+8
sound/core/pcm_misc.c
···
152
152
.width = 32, .phys = 32, .le = 1, .signd = 0,
153
153
.silence = { 0x69, 0x69, 0x69, 0x69 },
154
154
},
155
+
[SNDRV_PCM_FORMAT_DSD_U16_BE] = {
156
+
.width = 16, .phys = 16, .le = 0, .signd = 0,
157
+
.silence = { 0x69, 0x69 },
158
+
},
159
+
[SNDRV_PCM_FORMAT_DSD_U32_BE] = {
160
+
.width = 32, .phys = 32, .le = 0, .signd = 0,
161
+
.silence = { 0x69, 0x69, 0x69, 0x69 },
162
+
},
155
163
/* FIXME: the following three formats are not defined properly yet */
156
164
[SNDRV_PCM_FORMAT_MPEG] = {
157
165
.le = -1, .signd = -1,
-1
sound/pci/hda/patch_realtek.c
-1
sound/pci/hda/patch_realtek.c
···
4818
4818
SND_PCI_QUIRK(0x103c, 0x221b, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),
4819
4819
SND_PCI_QUIRK(0x103c, 0x2221, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),
4820
4820
SND_PCI_QUIRK(0x103c, 0x2225, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),
4821
-
SND_PCI_QUIRK(0x103c, 0x2246, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),
4822
4821
SND_PCI_QUIRK(0x103c, 0x2253, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),
4823
4822
SND_PCI_QUIRK(0x103c, 0x2254, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),
4824
4823
SND_PCI_QUIRK(0x103c, 0x2255, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),
+2
-2
sound/usb/mixer_quirks.c
+2
-2
sound/usb/mixer_quirks.c
···
593
593
if (mixer->chip->shutdown)
594
594
ret = -ENODEV;
595
595
else
596
-
ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), bRequest,
596
+
ret = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), bRequest,
597
597
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
598
598
0, wIndex,
599
-
&tmp, sizeof(tmp), 1000);
599
+
&tmp, sizeof(tmp));
600
600
up_read(&mixer->chip->shutdown_rwsem);
601
601
602
602
if (ret < 0) {
+2
-2
sound/usb/quirks.c
+2
-2
sound/usb/quirks.c
···
1193
1193
/* iFi Audio micro/nano iDSD */
1194
1194
case USB_ID(0x20b1, 0x3008):
1195
1195
if (fp->altsetting == 2)
1196
-
return SNDRV_PCM_FMTBIT_DSD_U32_LE;
1196
+
return SNDRV_PCM_FMTBIT_DSD_U32_BE;
1197
1197
break;
1198
1198
/* DIYINHK DSD DXD 384kHz USB to I2S/DSD */
1199
1199
case USB_ID(0x20b1, 0x2009):
1200
1200
if (fp->altsetting == 3)
1201
-
return SNDRV_PCM_FMTBIT_DSD_U32_LE;
1201
+
return SNDRV_PCM_FMTBIT_DSD_U32_BE;
1202
1202
break;
1203
1203
default:
1204
1204
break;