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

Commit 9bbcbad4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Most of commits found here are for ASoC device specific fixes,
  arizona, cs4271, wm5102, wm2200, etc, in addition to a couple of
  memory leak fixes in ASoC core.

  Other than that, regression fixes in HD-audio and USB-audio, and a fix
  for new Realtek codecs."

* tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (30 commits)
  ALSA: usb-audio: Fix NULL dereference by access to non-existing substream
  ALSA: hda - Add support of new codec ALC284
  ALSA: usb-audio: Make ebox44_table static
  ALSA: hdspm - Fix wordclock status on AES32
  Revert "ALSA: hda - Shut up pins at power-saving mode with Conexnat codecs"
  ALSA: hda - Disable runtime D3 for Intel CPT & co
  ALSA: pxa27x: fix ac97 warm reset
  ALSA: pxa27x: fix ac97 cold reset
  ASoC: wm_adsp: Ensure that block writes are from DMA aligned addresses
  ASoC: wm2000: Fix sense of speech clarity enable
  ASoC: wm5100: Remove DSP B and left justified formats
  ASoC: arizona: Remove DSP B and left justified AIF modes
  ASoC: wm2200: Remove DSP B and left justified AIF modes
  ASoC: wm5102: Improve speaker enable performance
  ASoC: core: fix the memory leak in case of remove_aux_dev()
  ASoC: core: fix the memory leak in case of device_add() failure
  ASoC: cs42l52: Catch no-match case in cs42l52_get_clk
  ASoC: lm49453: Update lm49453_reg_defs values as per LM49453 HW revision-B
  ASoC: lm49453: Fix adc, mic and sidetone volume ranges
  ASoC: arizona: Correct FLL source definitions
  ...
parents b87fc3e6 31be5425

arch/arm/mach-pxa/include/mach/mfp-pxa27x.h

+3 −0
Original line number Diff line number Diff line
@@ -463,6 +463,9 @@ 
	GPIO76_LCD_PCLK,	\

	GPIO77_LCD_BIAS



/* these enable a work-around for a hw bug in pxa27x during ac97 warm reset */

#define GPIO113_AC97_nRESET_GPIO_HIGH MFP_CFG_OUT(GPIO113, AF0, DEFAULT)

#define GPIO95_AC97_nRESET_GPIO_HIGH MFP_CFG_OUT(GPIO95, AF0, DEFAULT)



extern int keypad_set_wake(unsigned int on);

#endif /* __ASM_ARCH_MFP_PXA27X_H */

arch/arm/mach-pxa/pxa27x.c

+2 −2
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ void pxa27x_clear_otgph(void) 
EXPORT_SYMBOL(pxa27x_clear_otgph);



static unsigned long ac97_reset_config[] = {

	GPIO113_GPIO,

	GPIO113_AC97_nRESET_GPIO_HIGH,

	GPIO113_AC97_nRESET,

	GPIO95_GPIO,

	GPIO95_AC97_nRESET_GPIO_HIGH,

	GPIO95_AC97_nRESET,

};

include/sound/cs4271.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


struct cs4271_platform_data {

	int gpio_nreset;	/* GPIO driving Reset pin, if any */

	int amutec_eq_bmutec:1;	/* flag to enable AMUTEC=BMUTEC */

	bool amutec_eq_bmutec;	/* flag to enable AMUTEC=BMUTEC */

};



#endif /* __CS4271_H */

include/sound/soc.h

+6 −4
Original line number Diff line number Diff line
@@ -58,8 +58,9 @@ 
	.info = snd_soc_info_volsw_range, .get = snd_soc_get_volsw_range, \

	.put = snd_soc_put_volsw_range, \

	.private_value = (unsigned long)&(struct soc_mixer_control) \

		{.reg = xreg, .shift = xshift, .min = xmin,\

		 .max = xmax, .platform_max = xmax, .invert = xinvert} }

		{.reg = xreg, .rreg = xreg, .shift = xshift, \

		 .rshift = xshift,  .min = xmin, .max = xmax, \

		 .platform_max = xmax, .invert = xinvert} }

#define SOC_SINGLE_TLV(xname, reg, shift, max, invert, tlv_array) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
@@ -88,8 +89,9 @@ 
	.info = snd_soc_info_volsw_range, \

	.get = snd_soc_get_volsw_range, .put = snd_soc_put_volsw_range, \

	.private_value = (unsigned long)&(struct soc_mixer_control) \

		{.reg = xreg, .shift = xshift, .min = xmin,\

		 .max = xmax, .platform_max = xmax, .invert = xinvert} }

		{.reg = xreg, .rreg = xreg, .shift = xshift, \

		 .rshift = xshift, .min = xmin, .max = xmax, \

		 .platform_max = xmax, .invert = xinvert} }

#define SOC_DOUBLE(xname, reg, shift_left, shift_right, max, invert) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\

	.info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \

sound/arm/pxa2xx-ac97-lib.c

+23 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/delay.h>

#include <linux/module.h>

#include <linux/io.h>

#include <linux/gpio.h>



#include <sound/ac97_codec.h>

#include <sound/pxa2xx-lib.h>
@@ -148,6 +149,8 @@ static inline void pxa_ac97_warm_pxa27x(void) 


static inline void pxa_ac97_cold_pxa27x(void)

{

	unsigned int timeout;



	GCR &=  GCR_COLD_RST;  /* clear everything but nCRST */

	GCR &= ~GCR_COLD_RST;  /* then assert nCRST */
@@ -157,8 +160,10 @@ static inline void pxa_ac97_cold_pxa27x(void) 
	clk_enable(ac97conf_clk);

	udelay(5);

	clk_disable(ac97conf_clk);

	GCR = GCR_COLD_RST;

	udelay(50);

	GCR = GCR_COLD_RST | GCR_WARM_RST;

	timeout = 100;     /* wait for the codec-ready bit to be set */

	while (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR)) && timeout--)

		mdelay(1);

}

#endif
@@ -340,8 +345,21 @@ int pxa2xx_ac97_hw_probe(struct platform_device *dev) 
	}



	if (cpu_is_pxa27x()) {

		/* Use GPIO 113 as AC97 Reset on Bulverde */

		/*

		 * This gpio is needed for a work-around to a bug in the ac97

		 * controller during warm reset.  The direction and level is set

		 * here so that it is an output driven high when switching from

		 * AC97_nRESET alt function to generic gpio.

		 */

		ret = gpio_request_one(reset_gpio, GPIOF_OUT_INIT_HIGH,

				       "pxa27x ac97 reset");

		if (ret < 0) {

			pr_err("%s: gpio_request_one() failed: %d\n",

			       __func__, ret);

			goto err_conf;

		}

		pxa27x_assert_ac97reset(reset_gpio, 0);



		ac97conf_clk = clk_get(&dev->dev, "AC97CONFCLK");

		if (IS_ERR(ac97conf_clk)) {

			ret = PTR_ERR(ac97conf_clk);
@@ -384,6 +402,8 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_probe); 


void pxa2xx_ac97_hw_remove(struct platform_device *dev)

{

	if (cpu_is_pxa27x())

		gpio_free(reset_gpio);

	GCR |= GCR_ACLINK_OFF;

	free_irq(IRQ_AC97, NULL);

	if (ac97conf_clk) {