Unverified Commit 5b813eca authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/core' into asoc-next

parents b872617c 971da24c

include/sound/soc.h

+3 −0
Original line number Diff line number Diff line
@@ -802,6 +802,9 @@ struct snd_soc_component_driver { 
	int (*suspend)(struct snd_soc_component *);

	int (*resume)(struct snd_soc_component *);



	unsigned int (*read)(struct snd_soc_component *, unsigned int);

	int (*write)(struct snd_soc_component *, unsigned int, unsigned int);



	/* pcm creation and destruction */

	int (*pcm_new)(struct snd_soc_pcm_runtime *);

	void (*pcm_free)(struct snd_pcm *);

sound/soc/soc-core.c

+15 −4
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static umode_t soc_dev_attr_is_visible(struct kobject *kobj, 


	if (attr == &dev_attr_pmdown_time.attr)

		return attr->mode; /* always visible */

	return rtd->codec ? attr->mode : 0; /* enabled only with codec */

	return rtd->num_codecs ? attr->mode : 0; /* enabled only with codec */

}



static const struct attribute_group soc_dapm_dev_group = {
@@ -590,14 +590,23 @@ struct snd_soc_component *snd_soc_rtdcom_lookup(struct snd_soc_pcm_runtime *rtd, 
{

	struct snd_soc_rtdcom_list *rtdcom;



	if (!driver_name)

		return NULL;



	for_each_rtdcom(rtd, rtdcom) {

		if ((rtdcom->component->driver->name == driver_name) ||

		    strcmp(rtdcom->component->driver->name, driver_name) == 0)

		const char *component_name = rtdcom->component->driver->name;



		if (!component_name)

			continue;



		if ((component_name == driver_name) ||

		    strcmp(component_name, driver_name) == 0)

			return rtdcom->component;

	}



	return NULL;

}

EXPORT_SYMBOL_GPL(snd_soc_rtdcom_lookup);



struct snd_pcm_substream *snd_soc_get_dai_substream(struct snd_soc_card *card,

		const char *dai_link, int stream)
@@ -1945,7 +1954,9 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, 
	}



	/* Flip the polarity for the "CPU" end of a CODEC<->CODEC link */

	if (cpu_dai->codec) {

	/* the component which has non_legacy_dai_naming is Codec */

	if (cpu_dai->codec ||

	    cpu_dai->component->driver->non_legacy_dai_naming) {

		unsigned int inv_dai_fmt;



		inv_dai_fmt = dai_fmt & ~SND_SOC_DAIFMT_MASTER_MASK;

sound/soc/soc-io.c

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ int snd_soc_component_read(struct snd_soc_component *component, 
		ret = regmap_read(component->regmap, reg, val);

	else if (component->read)

		ret = component->read(component, reg, val);

	else if (component->driver->read) {

		*val = component->driver->read(component, reg);

		ret = 0;

	}

	else

		ret = -EIO;
@@ -70,6 +74,8 @@ int snd_soc_component_write(struct snd_soc_component *component, 
		return regmap_write(component->regmap, reg, val);

	else if (component->write)

		return component->write(component, reg, val);

	else if (component->driver->write)

		return component->driver->write(component, reg, val);

	else

		return -EIO;

}

sound/soc/soc-ops.c

+2 −2
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ int snd_soc_get_volsw_sx(struct snd_kcontrol *kcontrol, 
	unsigned int rshift = mc->rshift;

	int max = mc->max;

	int min = mc->min;

	int mask = (1 << (fls(min + max) - 1)) - 1;

	unsigned int mask = (1 << (fls(min + max) - 1)) - 1;

	unsigned int val;

	int ret;
@@ -423,7 +423,7 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, 
	unsigned int rshift = mc->rshift;

	int max = mc->max;

	int min = mc->min;

	int mask = (1 << (fls(min + max) - 1)) - 1;

	unsigned int mask = (1 << (fls(min + max) - 1)) - 1;

	int err = 0;

	unsigned int val, val_mask, val2 = 0;