Commit b34510b7 authored by Mark Brown's avatar Mark Brown
Browse files

Merge tag 'asoc-v3.19-rc2' into asoc-linus 

ASoC: Updates for v3.20

Nothing too exciting here yet, a small optimization for DAPM from
Lars-Peter and a few small bits and pieces for drivers but nothing
that really stands out.

# gpg: Signature made Tue 30 Dec 2014 00:15:48 HKT using RSA key ID 5D5487D0
# gpg: Oops: keyid_from_fingerprint: no pubkey
# gpg: key AF88CD16: no public key for trusted key - skipped
# gpg: key AF88CD16 marked as ultimately trusted
# gpg: key 5621E907: no public key for trusted key - skipped
# gpg: key 5621E907 marked as ultimately trusted
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg:                 aka "Mark Brown <broonie@debian.org>"
# gpg:                 aka "Mark Brown <broonie@kernel.org>"
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg:                 aka "Mark Brown <broonie@linaro.org>"
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"
parents e36f014e 1b9f1ae8

Documentation/devicetree/bindings/sound/pcm512x.txt

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ on the board). 


Required properties:



  - compatible : One of "ti,pcm5121" or "ti,pcm5122"

  - compatible : One of "ti,pcm5121", "ti,pcm5122", "ti,pcm5141" or

                 "ti,pcm5142"



  - reg : the I2C address of the device for I2C, the chip select

          number for SPI.

include/sound/soc-dapm.h

+0 −1
Original line number Diff line number Diff line
@@ -431,7 +431,6 @@ int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, 
					   const char *pin);

int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,

				const char *pin);

void snd_soc_dapm_auto_nc_pins(struct snd_soc_card *card);

unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol);



/* Mostly internal - should not normally be used */

sound/soc/codecs/pcm512x-i2c.c

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ static int pcm512x_i2c_remove(struct i2c_client *i2c) 
static const struct i2c_device_id pcm512x_i2c_id[] = {

	{ "pcm5121", },

	{ "pcm5122", },

	{ "pcm5141", },

	{ "pcm5142", },

	{ }

};

MODULE_DEVICE_TABLE(i2c, pcm512x_i2c_id);
@@ -53,6 +55,8 @@ MODULE_DEVICE_TABLE(i2c, pcm512x_i2c_id); 
static const struct of_device_id pcm512x_of_match[] = {

	{ .compatible = "ti,pcm5121", },

	{ .compatible = "ti,pcm5122", },

	{ .compatible = "ti,pcm5141", },

	{ .compatible = "ti,pcm5142", },

	{ }

};

MODULE_DEVICE_TABLE(of, pcm512x_of_match);

sound/soc/codecs/pcm512x-spi.c

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ static int pcm512x_spi_remove(struct spi_device *spi) 
static const struct spi_device_id pcm512x_spi_id[] = {

	{ "pcm5121", },

	{ "pcm5122", },

	{ "pcm5141", },

	{ "pcm5142", },

	{ },

};

MODULE_DEVICE_TABLE(spi, pcm512x_spi_id);
@@ -50,6 +52,8 @@ MODULE_DEVICE_TABLE(spi, pcm512x_spi_id); 
static const struct of_device_id pcm512x_of_match[] = {

	{ .compatible = "ti,pcm5121", },

	{ .compatible = "ti,pcm5122", },

	{ .compatible = "ti,pcm5141", },

	{ .compatible = "ti,pcm5142", },

	{ }

};

MODULE_DEVICE_TABLE(of, pcm512x_of_match);

sound/soc/codecs/rt5670.c

+38 −0
Original line number Diff line number Diff line
@@ -14,10 +14,12 @@ 
#include <linux/init.h>

#include <linux/delay.h>

#include <linux/pm.h>

#include <linux/pm_runtime.h>

#include <linux/i2c.h>

#include <linux/platform_device.h>

#include <linux/acpi.h>

#include <linux/spi/spi.h>

#include <linux/dmi.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>
@@ -2188,6 +2190,13 @@ static int rt5670_set_dai_sysclk(struct snd_soc_dai *dai, 
	if (freq == rt5670->sysclk && clk_id == rt5670->sysclk_src)

		return 0;



	if (rt5670->pdata.jd_mode) {

		if (clk_id == RT5670_SCLK_S_PLL1)

			snd_soc_dapm_force_enable_pin(&codec->dapm, "PLL1");

		else

			snd_soc_dapm_disable_pin(&codec->dapm, "PLL1");

		snd_soc_dapm_sync(&codec->dapm);

	}

	switch (clk_id) {

	case RT5670_SCLK_S_MCLK:

		reg_val |= RT5670_SCLK_SRC_MCLK;
@@ -2549,6 +2558,17 @@ static struct acpi_device_id rt5670_acpi_match[] = { 
MODULE_DEVICE_TABLE(acpi, rt5670_acpi_match);

#endif



static const struct dmi_system_id dmi_platform_intel_braswell[] = {

	{

		.ident = "Intel Braswell",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),

			DMI_MATCH(DMI_BOARD_NAME, "Braswell CRB"),

		},

	},

	{}

};



static int rt5670_i2c_probe(struct i2c_client *i2c,

		    const struct i2c_device_id *id)

{
@@ -2568,6 +2588,12 @@ static int rt5670_i2c_probe(struct i2c_client *i2c, 
	if (pdata)

		rt5670->pdata = *pdata;



	if (dmi_check_system(dmi_platform_intel_braswell)) {

		rt5670->pdata.dmic_en = true;

		rt5670->pdata.dmic1_data_pin = RT5670_DMIC_DATA_IN2P;

		rt5670->pdata.jd_mode = 1;

	}



	rt5670->regmap = devm_regmap_init_i2c(i2c, &rt5670_regmap);

	if (IS_ERR(rt5670->regmap)) {

		ret = PTR_ERR(rt5670->regmap);
@@ -2609,6 +2635,10 @@ static int rt5670_i2c_probe(struct i2c_client *i2c, 
	}



	if (rt5670->pdata.jd_mode) {

		regmap_update_bits(rt5670->regmap, RT5670_GLB_CLK,

				   RT5670_SCLK_SRC_MASK, RT5670_SCLK_SRC_RCCLK);

		rt5670->sysclk = 0;

		rt5670->sysclk_src = RT5670_SCLK_S_RCCLK;

		regmap_update_bits(rt5670->regmap, RT5670_PWR_ANLG1,

				   RT5670_PWR_MB, RT5670_PWR_MB);

		regmap_update_bits(rt5670->regmap, RT5670_PWR_ANLG2,
@@ -2716,18 +2746,26 @@ static int rt5670_i2c_probe(struct i2c_client *i2c, 


	}



	pm_runtime_enable(&i2c->dev);

	pm_request_idle(&i2c->dev);



	ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5670,

			rt5670_dai, ARRAY_SIZE(rt5670_dai));

	if (ret < 0)

		goto err;



	pm_runtime_put(&i2c->dev);



	return 0;

err:

	pm_runtime_disable(&i2c->dev);



	return ret;

}



static int rt5670_i2c_remove(struct i2c_client *i2c)

{

	pm_runtime_disable(&i2c->dev);

	snd_soc_unregister_codec(&i2c->dev);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE