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

Commit 45605a87 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-2.6.37' of... 

Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
parents a09f73fa 6c20c807

arch/arm/mach-mx3/clock-imx31.c

+2 −2
Original line number Diff line number Diff line
@@ -558,8 +558,8 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK("mxc_w1.0", NULL, owire_clk)

	_REGISTER_CLOCK("mxc-mmc.0", NULL, sdhc1_clk)

	_REGISTER_CLOCK("mxc-mmc.1", NULL, sdhc2_clk)

	_REGISTER_CLOCK("imx-ssi-dai.0", NULL, ssi1_clk)

	_REGISTER_CLOCK("imx-ssi-dai.1", NULL, ssi2_clk)

	_REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)

	_REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)

	_REGISTER_CLOCK(NULL, "firi", firi_clk)

	_REGISTER_CLOCK(NULL, "ata", ata_clk)

	_REGISTER_CLOCK(NULL, "rtic", rtic_clk)

arch/arm/mach-mx3/clock-imx35.c

+2 −2
Original line number Diff line number Diff line
@@ -464,8 +464,8 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK(NULL, "sdma", sdma_clk)

	_REGISTER_CLOCK(NULL, "spba", spba_clk)

	_REGISTER_CLOCK(NULL, "spdif", spdif_clk)

	_REGISTER_CLOCK("imx-ssi-dai.0", NULL, ssi1_clk)

	_REGISTER_CLOCK("imx-ssi-dai.1", NULL, ssi2_clk)

	_REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)

	_REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)

	_REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk)

	_REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk)

	_REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk)

arch/arm/mach-mx3/devices.c

+2 −2
Original line number Diff line number Diff line
@@ -327,14 +327,14 @@ static struct resource imx_ssi_resources1[] = { 
};



struct platform_device imx_ssi_device0 = {

	.name = "imx-ssi-dai",

	.name = "imx-ssi",

	.id = 0,

	.num_resources = ARRAY_SIZE(imx_ssi_resources0),

	.resource = imx_ssi_resources0,

};



struct platform_device imx_ssi_device1 = {

	.name = "imx-ssi-dai",

	.name = "imx-ssi",

	.id = 1,

	.num_resources = ARRAY_SIZE(imx_ssi_resources1),

	.resource = imx_ssi_resources1,

arch/arm/plat-mxc/audmux-v2.c

+2 −2
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ static const char *audmux_port_string(int port) 
{

	switch (port) {

	case MX31_AUDMUX_PORT1_SSI0:

		return "imx-ssi-dai.0";

		return "imx-ssi.0";

	case MX31_AUDMUX_PORT2_SSI1:

		return "imx-ssi-dai.1";

		return "imx-ssi.1";

	case MX31_AUDMUX_PORT3_SSI_PINS_3:

		return "SSI3";

	case MX31_AUDMUX_PORT4_SSI_PINS_4:

include/sound/wm8962.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#define WM8962_GPIO_SET 0x10000



struct wm8962_pdata {

	int gpio_base;

	u32 gpio_init[WM8962_MAX_GPIO];



	/* Setup for microphone detection, raw value to be written to