Merge branch 'for-2.6.37' into for-2.6.38 (3df94756) · Commits · e / devices / android_kernel_xiaomi_markw

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,

sound/soc/codecs/wm8994.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -3905,6 +3905,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
		return -ENOMEM;
		snd_soc_codec_set_drvdata(codec, wm8994);

		codec->reg_cache = &wm8994->reg_cache;

		wm8994->pdata = dev_get_platdata(codec->dev->parent);
		wm8994->codec = codec;

sound/soc/davinci/davinci-evm.c

+29 −11

Original line number	Diff line number	Diff line
		@@ -158,12 +158,23 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd)
		}

		/* davinci-evm digital audio interface glue - connects codec <--> CPU */
		static struct snd_soc_dai_link evm_dai = {
		static struct snd_soc_dai_link dm6446_evm_dai = {
		.name = "TLV320AIC3X",
		.stream_name = "AIC3X",
		.cpu_dai_name = "davinci-mcasp.0",
		.cpu_dai_name = "davinci-mcbsp",
		.codec_dai_name = "tlv320aic3x-hifi",
		.codec_name = "tlv320aic3x-codec.0-001a",
		.codec_name = "tlv320aic3x-codec.1-001b",
		.platform_name = "davinci-pcm-audio",
		.init = evm_aic3x_init,
		.ops = &evm_ops,
		};

		static struct snd_soc_dai_link dm355_evm_dai = {
		.name = "TLV320AIC3X",
		.stream_name = "AIC3X",
		.cpu_dai_name = "davinci-mcbsp.1",
		.codec_dai_name = "tlv320aic3x-hifi",
		.codec_name = "tlv320aic3x-codec.1-001b",
		.platform_name = "davinci-pcm-audio",
		.init = evm_aic3x_init,
		.ops = &evm_ops,
		@@ -173,10 +184,10 @@ static struct snd_soc_dai_link dm365_evm_dai = {
		#ifdef CONFIG_SND_DM365_AIC3X_CODEC
		.name = "TLV320AIC3X",
		.stream_name = "AIC3X",
		.cpu_dai_name = "davinci-i2s",
		.cpu_dai_name = "davinci-mcbsp",
		.codec_dai_name = "tlv320aic3x-hifi",
		.init = evm_aic3x_init,
		.codec_name = "tlv320aic3x-codec.0-001a",
		.codec_name = "tlv320aic3x-codec.1-0018",
		.ops = &evm_ops,
		#elif defined(CONFIG_SND_DM365_VOICE_CODEC)
		.name = "Voice Codec - CQ93VC",
		@@ -220,10 +231,17 @@ static struct snd_soc_dai_link da8xx_evm_dai = {
		.ops = &evm_ops,
		};

		/* davinci dm6446, dm355 evm audio machine driver */
		static struct snd_soc_card snd_soc_card_evm = {
		.name = "DaVinci EVM",
		.dai_link = &evm_dai,
		/* davinci dm6446 evm audio machine driver */
		static struct snd_soc_card dm6446_snd_soc_card_evm = {
		.name = "DaVinci DM6446 EVM",
		.dai_link = &dm6446_evm_dai,
		.num_links = 1,
		};

		/* davinci dm355 evm audio machine driver */
		static struct snd_soc_card dm355_snd_soc_card_evm = {
		.name = "DaVinci DM355 EVM",
		.dai_link = &dm355_evm_dai,
		.num_links = 1,
		};

		@@ -262,10 +280,10 @@ static int __init evm_init(void)
		int ret;

		if (machine_is_davinci_evm()) {
		evm_snd_dev_data = &snd_soc_card_evm;
		evm_snd_dev_data = &dm6446_snd_soc_card_evm;
		index = 0;
		} else if (machine_is_davinci_dm355_evm()) {
		evm_snd_dev_data = &snd_soc_card_evm;
		evm_snd_dev_data = &dm355_snd_soc_card_evm;
		index = 1;
		} else if (machine_is_davinci_dm365_evm()) {
		evm_snd_dev_data = &dm365_snd_soc_card_evm;