Commit ea49b166 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (41 commits)
  ALSA: hda - Identify more variants for ALC269
  ALSA: hda - Fix wrong ALC269 variant check
  ALSA: hda - Enable jack sense for Thinkpad Edge 11
  ALSA: Revert "ALSA: hda - Fix switching between dmic and mic using the same mux on IDT/STAC"
  ALSA: hda - Fixed ALC887-VD initial error
  ALSA: atmel - Fix the return value in error path
  ALSA: hda: Use hp-laptop quirk to enable headphones automute for Asus A52J
  ALSA: snd-atmel-abdac: test wrong variable
  ALSA: azt3328: period bug fix (for PA), add missing ACK on stop timer
  ALSA: hda: Add Samsung R720 SSID for subwoofer pin fixup
  ALSA: sound/pci/asihpi/hpioctl.c: Remove unnecessary casts of pci_get_drvdata
  ALSA: sound/core/pcm_lib.c: Remove unnecessary semicolons
  ALSA: sound/ppc: Use printf extension %pR for struct resource
  ALSA: ac97: Apply quirk for Dell Latitude D610 binding Master and Headphone controls
  ASoC: uda134x - set reg_cache_default to uda134x_reg
  ASoC: Add support for MAX98089 CODEC
  ASoC: davinci: fixes for multi-component
  ASoC: Fix register cache setup WM8994 for multi-component
  ASoC: Fix dapm_seq_compare() for multi-component
  ASoC: RX1950: Fix hw_params function
  ...
parents a4ec046c 9e8c32ca

arch/arm/mach-davinci/dm355.c

+3 −3
Original line number Diff line number Diff line
@@ -359,8 +359,8 @@ static struct clk_lookup dm355_clks[] = { 
	CLK(NULL, "uart1", &uart1_clk),

	CLK(NULL, "uart2", &uart2_clk),

	CLK("i2c_davinci.1", NULL, &i2c_clk),

	CLK("davinci-asp.0", NULL, &asp0_clk),

	CLK("davinci-asp.1", NULL, &asp1_clk),

	CLK("davinci-mcbsp.0", NULL, &asp0_clk),

	CLK("davinci-mcbsp.1", NULL, &asp1_clk),

	CLK("davinci_mmc.0", NULL, &mmcsd0_clk),

	CLK("davinci_mmc.1", NULL, &mmcsd1_clk),

	CLK("spi_davinci.0", NULL, &spi0_clk),
@@ -664,7 +664,7 @@ static struct resource dm355_asp1_resources[] = { 
};



static struct platform_device dm355_asp1_device = {

	.name		= "davinci-asp",

	.name		= "davinci-mcbsp",

	.id		= 1,

	.num_resources	= ARRAY_SIZE(dm355_asp1_resources),

	.resource	= dm355_asp1_resources,

arch/arm/mach-davinci/dm365.c

+3 −3
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static struct clk_lookup dm365_clks[] = { 
	CLK(NULL, "usb", &usb_clk),

	CLK("davinci_emac.1", NULL, &emac_clk),

	CLK("davinci_voicecodec", NULL, &voicecodec_clk),

	CLK("davinci-asp.0", NULL, &asp0_clk),

	CLK("davinci-mcbsp", NULL, &asp0_clk),

	CLK(NULL, "rto", &rto_clk),

	CLK(NULL, "mjcp", &mjcp_clk),

	CLK(NULL, NULL, NULL),
@@ -922,8 +922,8 @@ static struct resource dm365_asp_resources[] = { 
};



static struct platform_device dm365_asp_device = {

	.name		= "davinci-asp",

	.id		= 0,

	.name		= "davinci-mcbsp",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(dm365_asp_resources),

	.resource	= dm365_asp_resources,

};

arch/arm/mach-davinci/dm644x.c

+2 −2
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static struct clk_lookup dm644x_clks[] = { 
	CLK("davinci_emac.1", NULL, &emac_clk),

	CLK("i2c_davinci.1", NULL, &i2c_clk),

	CLK("palm_bk3710", NULL, &ide_clk),

	CLK("davinci-asp", NULL, &asp_clk),

	CLK("davinci-mcbsp", NULL, &asp_clk),

	CLK("davinci_mmc.0", NULL, &mmcsd_clk),

	CLK(NULL, "spi", &spi_clk),

	CLK(NULL, "gpio", &gpio_clk),
@@ -580,7 +580,7 @@ static struct resource dm644x_asp_resources[] = { 
};



static struct platform_device dm644x_asp_device = {

	.name		= "davinci-asp",

	.name		= "davinci-mcbsp",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(dm644x_asp_resources),

	.resource	= dm644x_asp_resources,

include/linux/mfd/wm8350/audio.h

+0 −3
Original line number Diff line number Diff line
@@ -522,9 +522,6 @@ 
#define WM8350_MCLK_SEL_PLL_32K			3

#define WM8350_MCLK_SEL_MCLK			5



#define WM8350_MCLK_DIR_OUT			0

#define WM8350_MCLK_DIR_IN			1



/* clock divider id's */

#define WM8350_ADC_CLKDIV			0

#define WM8350_DAC_CLKDIV			1

sound/atmel/abdac.c

+2 −2
Original line number Diff line number Diff line
@@ -420,9 +420,9 @@ static int __devinit atmel_abdac_probe(struct platform_device *pdev) 
		return PTR_ERR(pclk);

	}

	sample_clk = clk_get(&pdev->dev, "sample_clk");

	if (IS_ERR(pclk)) {

	if (IS_ERR(sample_clk)) {

		dev_dbg(&pdev->dev, "no sample clock\n");

		retval = PTR_ERR(pclk);

		retval = PTR_ERR(sample_clk);

		goto out_put_pclk;

	}

	clk_enable(pclk);

CRA Git | Maintained and supported by SUSTech CRA and CCSE