Commit 5a2e73b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "One nice fix is Peter's patch to make the old good SB Audigy PCI to
  work with 32bit DMA instead of 31bit.  This allows the MIDI synth
  running on modern machines again.  Along with it, a few fixes for
  emu10k1 have merged.

  In ASoC side, there is one fix in the common code, but it's just
  trivial additions of static inline functions for CONFIG_PM=n.  The
  rest are various device-specific small fixes.

  Last but not least, a few HD-audio fixes are included, as usual, too"

* tag 'sound-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (23 commits)
  ASoC: rt5677: fixed wrong DMIC ref clock
  ALSA: emu10k1: Emu10k2 32 bit DMA mode
  ALSA: emux: Fix mutex deadlock in OSS emulation
  ASoC: Update email-id of Rajeev Kumar
  ASoC: rt5645: Fix mask for setting RT5645_DMIC_2_DP_GPIO12 bit
  ALSA: hda - Fix missing va_end() call in snd_hda_codec_pcm_new()
  ALSA: emux: Fix mutex deadlock at unloading
  ALSA: emu10k1: Fix card shortname string buffer overflow
  ALSA: hda - Add mute-LED mode control to Thinkpad
  ALSA: hda - Fix mute-LED fixed mode
  ALSA: hda - Fix click noise at start on Dell XPS13
  ASoC: rt5645: Add ACPI match ID
  ASoC: rt5677: add register patch for PLL
  ASoC: Intel: fix the makefile for atom code
  ASoC: dapm: Enable autodisable on SOC_DAPM_SINGLE_TLV_AUTODISABLE
  ASoC: add static inline funcs to fix a compiling issue
  ASoC: Intel: sst_byt: remove kfree for memory allocated with devm_kzalloc
  ASoC: samsung: s3c24xx-i2s: Fix return value check in s3c24xx_iis_dev_probe()
  ASoC: tfa9879: Fix return value check in tfa9879_i2c_probe()
  ASoC: fsl_ssi: Fix platform_get_irq() error handling
  ...
parents 9dbbe3cf 0ae3aba2

include/sound/designware_i2s.h

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar@st.com)

 * Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux@gmail.com)

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

include/sound/emu10k1.h

+9 −5
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ 


#define EMUPAGESIZE     4096

#define MAXREQVOICES    8

#define MAXPAGES        8192

#define MAXPAGES0       4096	/* 32 bit mode */

#define MAXPAGES1       8192	/* 31 bit mode */

#define RESERVED        0

#define NUM_MIDI        16

#define NUM_G           64              /* use all channels */
@@ -50,8 +51,7 @@ 


/* FIXME? - according to the OSS driver the EMU10K1 needs a 29 bit DMA mask */

#define EMU10K1_DMA_MASK	0x7fffffffUL	/* 31bit */

#define AUDIGY_DMA_MASK		0x7fffffffUL	/* 31bit FIXME - 32 should work? */

						/* See ALSA bug #1276 - rlrevell */

#define AUDIGY_DMA_MASK		0xffffffffUL	/* 32bit mode */



#define TMEMSIZE        256*1024

#define TMEMSIZEREG     4
@@ -466,8 +466,11 @@ 


#define MAPB			0x0d		/* Cache map B						*/



#define MAP_PTE_MASK		0xffffe000	/* The 19 MSBs of the PTE indexed by the PTI		*/

#define MAP_PTI_MASK		0x00001fff	/* The 13 bit index to one of the 8192 PTE dwords      	*/

#define MAP_PTE_MASK0		0xfffff000	/* The 20 MSBs of the PTE indexed by the PTI		*/

#define MAP_PTI_MASK0		0x00000fff	/* The 12 bit index to one of the 4096 PTE dwords      	*/



#define MAP_PTE_MASK1		0xffffe000	/* The 19 MSBs of the PTE indexed by the PTI		*/

#define MAP_PTI_MASK1		0x00001fff	/* The 13 bit index to one of the 8192 PTE dwords      	*/



/* 0x0e, 0x0f: Not used */
@@ -1704,6 +1707,7 @@ struct snd_emu10k1 { 
	unsigned short model;			/* subsystem id */

	unsigned int card_type;			/* EMU10K1_CARD_* */

	unsigned int ecard_ctrl;		/* ecard control bits */

	unsigned int address_mode;		/* address mode */

	unsigned long dma_mask;			/* PCI DMA mask */

	unsigned int delay_pcm_irq;		/* in samples */

	int max_cache_pages;			/* max memory size / PAGE_SIZE */

include/sound/soc-dapm.h

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ struct device; 
	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | SNDRV_CTL_ELEM_ACCESS_READWRITE,\

	.tlv.p = (tlv_array), \

	.get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \

	.private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 0) }

	.private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 1) }

#define SOC_DAPM_SINGLE_TLV_VIRT(xname, max, tlv_array) \

	SOC_DAPM_SINGLE(xname, SND_SOC_NOPM, 0, max, 0, tlv_array)

#define SOC_DAPM_ENUM(xname, xenum) \

include/sound/soc.h

+12 −0
Original line number Diff line number Diff line
@@ -387,8 +387,20 @@ int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source, 
int snd_soc_register_card(struct snd_soc_card *card);

int snd_soc_unregister_card(struct snd_soc_card *card);

int devm_snd_soc_register_card(struct device *dev, struct snd_soc_card *card);

#ifdef CONFIG_PM_SLEEP

int snd_soc_suspend(struct device *dev);

int snd_soc_resume(struct device *dev);

#else

static inline int snd_soc_suspend(struct device *dev)

{

	return 0;

}



static inline int snd_soc_resume(struct device *dev)

{

	return 0;

}

#endif

int snd_soc_poweroff(struct device *dev);

int snd_soc_register_platform(struct device *dev,

		const struct snd_soc_platform_driver *platform_drv);

include/sound/spear_dma.h

+1 −1
Original line number Diff line number Diff line 
/*

* linux/spear_dma.h

*

* Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar@st.com)

* Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux@gmail.com)

*

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License as published by

CRA Git | Maintained and supported by SUSTech CRA and CCSE