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

Commit 9e8c32ca authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/asoc' into for-linus

parents 48c88e82 bf86f07e

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/soc/atmel/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ config SND_ATMEL_SOC_SSC 


config SND_AT91_SOC_SAM9G20_WM8731

	tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board"

	depends on ATMEL_SSC && ARCH_AT91SAM9G20 && SND_ATMEL_SOC

	depends on ATMEL_SSC && ARCH_AT91SAM9G20 && SND_ATMEL_SOC && \

                   AT91_PROGRAMMABLE_CLOCKS

	select SND_ATMEL_SOC_SSC

	select SND_SOC_WM8731

	help
@@ -25,7 +26,7 @@ config SND_AT91_SOC_SAM9G20_WM8731 


config SND_AT32_SOC_PLAYPAQ

        tristate "SoC Audio support for PlayPaq with WM8510"

        depends on SND_ATMEL_SOC && BOARD_PLAYPAQ

        depends on SND_ATMEL_SOC && BOARD_PLAYPAQ && AT91_PROGRAMMABLE_CLOCKS

        select SND_ATMEL_SOC_SSC

        select SND_SOC_WM8510

        help