Commit 12b76f3b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-fix-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Here are a collection of small fixes tha have been gathered for
  4.4-rc1.  The only significant changes are those in PCI drivers
  Kconfig, to use "depends on" instead of "select" for CONFIG_ZONE_DMA.
  A reverse select is often more user-friendly, but in this case, it
  makes hard to manage with the conflict with ZONE_DEVICE, so changed in
  such a way for now.

  Others are all small fixes and quirks: an error check in soundcore
  reigster_chrdev(), HD-audio HDMI/DP phantom jack fix, Intel Broxton DP
  quirk, USB-audio DSD device quirk, some constifications, etc"

* tag 'sound-fix-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: pci: depend on ZONE_DMA
  ALSA: hda - Simplify phantom jack handling for HDMI/DP
  ALSA: hda/hdmi - apply Skylake fix-ups to Broxton display codec
  ALSA: ctxfi: constify rsc ops structures
  ALSA: usb: Add native DSD support for Aune X1S
  ALSA: oxfw: add an comment to Kconfig for TASCAM FireOne
  sound: fix check for error condition of register_chrdev()
parents b3a0d9a2 2db1a579

sound/firewire/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ config SND_OXFW 
	   * Mackie(Loud) Tapco Link.Firewire

	   * Mackie(Loud) d.2 pro/d.4 pro

	   * Mackie(Loud) U.420/U.420d

	   * TASCAM FireOne



	  To compile this driver as a module, choose M here: the module

	  will be called snd-oxfw.

sound/pci/Kconfig

+12 −12
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ config SND_ALS300 
	select SND_PCM

	select SND_AC97_CODEC

	select SND_OPL3_LIB

	select ZONE_DMA

	depends on ZONE_DMA

	help

	  Say 'Y' or 'M' to include support for Avance Logic ALS300/ALS300+
@@ -50,7 +50,7 @@ config SND_ALI5451 
	tristate "ALi M5451 PCI Audio Controller"

	select SND_MPU401_UART

	select SND_AC97_CODEC

	select ZONE_DMA

	depends on ZONE_DMA

	help

	  Say Y here to include support for the integrated AC97 sound

	  device on motherboards using the ALi M5451 Audio Controller
@@ -155,7 +155,7 @@ config SND_AZT3328 
	select SND_PCM

	select SND_RAWMIDI

	select SND_AC97_CODEC

	select ZONE_DMA

	depends on ZONE_DMA

	help

	  Say Y here to include support for Aztech AZF3328 (PCI168)

	  soundcards.
@@ -463,7 +463,7 @@ config SND_EMU10K1 
	select SND_HWDEP

	select SND_RAWMIDI

	select SND_AC97_CODEC

	select ZONE_DMA

	depends on ZONE_DMA

	help

	  Say Y to include support for Sound Blaster PCI 512, Live!,

	  Audigy and E-mu APS (partially supported) soundcards.
@@ -479,7 +479,7 @@ config SND_EMU10K1X 
	tristate "Emu10k1X (Dell OEM Version)"

	select SND_AC97_CODEC

	select SND_RAWMIDI

	select ZONE_DMA

	depends on ZONE_DMA

	help

	  Say Y here to include support for the Dell OEM version of the

	  Sound Blaster Live!.
@@ -513,7 +513,7 @@ config SND_ES1938 
	select SND_OPL3_LIB

	select SND_MPU401_UART

	select SND_AC97_CODEC

	select ZONE_DMA

	depends on ZONE_DMA

	help

	  Say Y here to include support for soundcards based on ESS Solo-1

	  (ES1938, ES1946, ES1969) chips.
@@ -525,7 +525,7 @@ config SND_ES1968 
	tristate "ESS ES1968/1978 (Maestro-1/2/2E)"

	select SND_MPU401_UART

	select SND_AC97_CODEC

	select ZONE_DMA

	depends on ZONE_DMA

	help

	  Say Y here to include support for soundcards based on ESS Maestro

	  1/2/2E chips.
@@ -612,7 +612,7 @@ config SND_ICE1712 
	select SND_MPU401_UART

	select SND_AC97_CODEC

	select BITREVERSE

	select ZONE_DMA

	depends on ZONE_DMA

	help

	  Say Y here to include support for soundcards based on the

	  ICE1712 (Envy24) chip.
@@ -700,7 +700,7 @@ config SND_LX6464ES 
config SND_MAESTRO3

	tristate "ESS Allegro/Maestro3"

	select SND_AC97_CODEC

	select ZONE_DMA

	depends on ZONE_DMA

	help

	  Say Y here to include support for soundcards based on ESS Maestro 3

	  (Allegro) chips.
@@ -806,7 +806,7 @@ config SND_SIS7019 
	tristate "SiS 7019 Audio Accelerator"

	depends on X86_32

	select SND_AC97_CODEC

	select ZONE_DMA

	depends on ZONE_DMA

	help

	  Say Y here to include support for the SiS 7019 Audio Accelerator.
@@ -818,7 +818,7 @@ config SND_SONICVIBES 
	select SND_OPL3_LIB

	select SND_MPU401_UART

	select SND_AC97_CODEC

	select ZONE_DMA

	depends on ZONE_DMA

	help

	  Say Y here to include support for soundcards based on the S3

	  SonicVibes chip.
@@ -830,7 +830,7 @@ config SND_TRIDENT 
	tristate "Trident 4D-Wave DX/NX; SiS 7018"

	select SND_MPU401_UART

	select SND_AC97_CODEC

	select ZONE_DMA

	depends on ZONE_DMA

	help

	  Say Y here to include support for soundcards based on Trident

	  4D-Wave DX/NX or SiS 7018 chips.

sound/pci/ctxfi/ctamixer.c

+3 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static int amixer_output_slot(const struct rsc *rsc) 
	return (amixer_index(rsc) << 4) + 0x4;

}



static struct rsc_ops amixer_basic_rsc_ops = {

static const struct rsc_ops amixer_basic_rsc_ops = {

	.master		= amixer_master,

	.next_conj	= amixer_next_conj,

	.index		= amixer_index,
@@ -186,7 +186,7 @@ static int amixer_setup(struct amixer *amixer, struct rsc *input, 
	return 0;

}



static struct amixer_rsc_ops amixer_ops = {

static const struct amixer_rsc_ops amixer_ops = {

	.set_input		= amixer_set_input,

	.set_invalid_squash	= amixer_set_invalid_squash,

	.set_scale		= amixer_set_y,
@@ -357,7 +357,7 @@ static int sum_output_slot(const struct rsc *rsc) 
	return (sum_index(rsc) << 4) + 0xc;

}



static struct rsc_ops sum_basic_rsc_ops = {

static const struct rsc_ops sum_basic_rsc_ops = {

	.master		= sum_master,

	.next_conj	= sum_next_conj,

	.index		= sum_index,

sound/pci/ctxfi/ctamixer.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ struct amixer { 
	unsigned char idx[8];

	struct rsc *input;	/* pointer to a resource acting as source */

	struct sum *sum;	/* Put amixer output to this summation node */

	struct amixer_rsc_ops *ops;	/* AMixer specific operations */

	const struct amixer_rsc_ops *ops;	/* AMixer specific operations */

};



struct amixer_rsc_ops {

sound/pci/ctxfi/ctdaio.c

+5 −5
Original line number Diff line number Diff line
@@ -83,21 +83,21 @@ static int daio_in_next_conj_20k2(struct rsc *rsc) 
	return rsc->conj += 0x100;

}



static struct rsc_ops daio_out_rsc_ops = {

static const struct rsc_ops daio_out_rsc_ops = {

	.master		= daio_master,

	.next_conj	= daio_out_next_conj,

	.index		= daio_index,

	.output_slot	= NULL,

};



static struct rsc_ops daio_in_rsc_ops_20k1 = {

static const struct rsc_ops daio_in_rsc_ops_20k1 = {

	.master		= daio_master,

	.next_conj	= daio_in_next_conj_20k1,

	.index		= NULL,

	.output_slot	= daio_index,

};



static struct rsc_ops daio_in_rsc_ops_20k2 = {

static const struct rsc_ops daio_in_rsc_ops_20k2 = {

	.master		= daio_master,

	.next_conj	= daio_in_next_conj_20k2,

	.index		= NULL,
@@ -263,7 +263,7 @@ static int dao_clear_right_input(struct dao *dao) 
	return 0;

}



static struct dao_rsc_ops dao_ops = {

static const struct dao_rsc_ops dao_ops = {

	.set_spos		= dao_spdif_set_spos,

	.commit_write		= dao_commit_write,

	.get_spos		= dao_spdif_get_spos,
@@ -318,7 +318,7 @@ static int dai_commit_write(struct dai *dai) 
	return 0;

}



static struct dai_rsc_ops dai_ops = {

static const struct dai_rsc_ops dai_ops = {

	.set_srt_srcl		= dai_set_srt_srcl,

	.set_srt_srcr		= dai_set_srt_srcr,

	.set_srt_msr		= dai_set_srt_msr,

CRA Git | Maintained and supported by SUSTech CRA and CCSE