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

Merge branch 'topic/component' of... 

Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core

Conflicts:
	sound/soc/soc-core.c
parents 1a39019e b37f1d12

include/sound/soc.h

+45 −14
Original line number Diff line number Diff line
@@ -393,12 +393,6 @@ int devm_snd_soc_register_component(struct device *dev, 
			 const struct snd_soc_component_driver *cmpnt_drv,

			 struct snd_soc_dai_driver *dai_drv, int num_dai);

void snd_soc_unregister_component(struct device *dev);

int snd_soc_codec_volatile_register(struct snd_soc_codec *codec,

				    unsigned int reg);

int snd_soc_codec_readable_register(struct snd_soc_codec *codec,

				    unsigned int reg);

int snd_soc_codec_writable_register(struct snd_soc_codec *codec,

				    unsigned int reg);

int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,

			       struct regmap *regmap);

int snd_soc_cache_sync(struct snd_soc_codec *codec);
@@ -668,6 +662,7 @@ struct snd_soc_component { 
	unsigned int active;



	unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */

	unsigned int registered_as_component:1;



	struct list_head list;
@@ -692,9 +687,6 @@ struct snd_soc_codec { 
	struct list_head list;

	struct list_head card_list;

	int num_dai;

	int (*volatile_register)(struct snd_soc_codec *, unsigned int);

	int (*readable_register)(struct snd_soc_codec *, unsigned int);

	int (*writable_register)(struct snd_soc_codec *, unsigned int);



	/* runtime */

	struct snd_ac97 *ac97;  /* for ad-hoc ac97 devices */
@@ -756,11 +748,6 @@ struct snd_soc_codec_driver { 
	/* codec IO */

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

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

	int (*display_register)(struct snd_soc_codec *, char *,

				size_t, unsigned int);

	int (*volatile_register)(struct snd_soc_codec *, unsigned int);

	int (*readable_register)(struct snd_soc_codec *, unsigned int);

	int (*writable_register)(struct snd_soc_codec *, unsigned int);

	unsigned int reg_cache_size;

	short reg_cache_step;

	short reg_word_size;
@@ -791,6 +778,7 @@ struct snd_soc_platform_driver { 
	int (*remove)(struct snd_soc_platform *);

	int (*suspend)(struct snd_soc_dai *dai);

	int (*resume)(struct snd_soc_dai *dai);

	struct snd_soc_component_driver component_driver;



	/* pcm creation and destruction */

	int (*pcm_new)(struct snd_soc_pcm_runtime *);
@@ -844,6 +832,8 @@ struct snd_soc_platform { 
	struct list_head list;

	struct list_head card_list;



	struct snd_soc_component component;



	struct snd_soc_dapm_context dapm;



#ifdef CONFIG_DEBUG_FS
@@ -1120,6 +1110,19 @@ static inline struct snd_soc_codec *snd_soc_component_to_codec( 
	return container_of(component, struct snd_soc_codec, component);

}



/**

 * snd_soc_component_to_platform() - Casts a component to the platform it is embedded in

 * @component: The component to cast to a platform

 *

 * This function must only be used on components that are known to be platforms.

 * Otherwise the behavior is undefined.

 */

static inline struct snd_soc_platform *snd_soc_component_to_platform(

	struct snd_soc_component *component)

{

	return container_of(component, struct snd_soc_platform, component);

}



/* codec IO */

unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg);

unsigned int snd_soc_write(struct snd_soc_codec *codec,
@@ -1228,6 +1231,34 @@ static inline bool snd_soc_codec_is_active(struct snd_soc_codec *codec) 
	return snd_soc_component_is_active(&codec->component);

}



/**

 * snd_soc_kcontrol_codec() - Returns the CODEC that registered the control

 * @kcontrol: The control for which to get the CODEC

 *

 * Note: This function will only work correctly if the control has been

 * registered with snd_soc_add_codec_controls() or via table based setup of

 * snd_soc_codec_driver. Otherwise the behavior is undefined.

 */

static inline struct snd_soc_codec *snd_soc_kcontrol_codec(

	struct snd_kcontrol *kcontrol)

{

	return snd_kcontrol_chip(kcontrol);

}



/**

 * snd_soc_kcontrol_platform() - Returns the platform that registerd the control

 * @kcontrol: The control for which to get the platform

 *

 * Note: This function will only work correctly if the control has been

 * registered with snd_soc_add_platform_controls() or via table based setup of

 * a snd_soc_platform_driver. Otherwise the behavior is undefined.

 */

static inline struct snd_soc_codec *snd_soc_kcontrol_platform(

	struct snd_kcontrol *kcontrol)

{

	return snd_kcontrol_chip(kcontrol);

}



int snd_soc_util_init(void);

void snd_soc_util_exit(void);

sound/soc/codecs/88pm860x-codec.c

+4 −4
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static int snd_soc_get_volsw_2r_st(struct snd_kcontrol *kcontrol, 
{

	struct soc_mixer_control *mc =

		(struct soc_mixer_control *)kcontrol->private_value;

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	unsigned int reg = mc->reg;

	unsigned int reg2 = mc->rreg;

	int val[2], val2[2], i;
@@ -300,7 +300,7 @@ static int snd_soc_put_volsw_2r_st(struct snd_kcontrol *kcontrol, 
{

	struct soc_mixer_control *mc =

		(struct soc_mixer_control *)kcontrol->private_value;

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	unsigned int reg = mc->reg;

	unsigned int reg2 = mc->rreg;

	int err;
@@ -333,7 +333,7 @@ static int snd_soc_get_volsw_2r_out(struct snd_kcontrol *kcontrol, 
{

	struct soc_mixer_control *mc =

		(struct soc_mixer_control *)kcontrol->private_value;

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	unsigned int reg = mc->reg;

	unsigned int reg2 = mc->rreg;

	unsigned int shift = mc->shift;
@@ -353,7 +353,7 @@ static int snd_soc_put_volsw_2r_out(struct snd_kcontrol *kcontrol, 
{

	struct soc_mixer_control *mc =

		(struct soc_mixer_control *)kcontrol->private_value;

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	unsigned int reg = mc->reg;

	unsigned int reg2 = mc->rreg;

	unsigned int shift = mc->shift;

sound/soc/codecs/ab8500-codec.c

+6 −6
Original line number Diff line number Diff line
@@ -1139,7 +1139,7 @@ static void anc_configure(struct snd_soc_codec *codec, 
static int sid_status_control_get(struct snd_kcontrol *kcontrol,

		struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev);



	mutex_lock(&codec->mutex);
@@ -1153,7 +1153,7 @@ static int sid_status_control_get(struct snd_kcontrol *kcontrol, 
static int sid_status_control_put(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev);

	unsigned int param, sidconf, val;

	int status = 1;
@@ -1208,7 +1208,7 @@ static int sid_status_control_put(struct snd_kcontrol *kcontrol, 
static int anc_status_control_get(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev);



	mutex_lock(&codec->mutex);
@@ -1221,7 +1221,7 @@ static int anc_status_control_get(struct snd_kcontrol *kcontrol, 
static int anc_status_control_put(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev);

	struct device *dev = codec->dev;

	bool apply_fir, apply_iir;
@@ -1306,7 +1306,7 @@ static int filter_control_info(struct snd_kcontrol *kcontrol, 
static int filter_control_get(struct snd_kcontrol *kcontrol,

			struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct filter_control *fc =

			(struct filter_control *)kcontrol->private_value;

	unsigned int i;
@@ -1322,7 +1322,7 @@ static int filter_control_get(struct snd_kcontrol *kcontrol, 
static int filter_control_put(struct snd_kcontrol *kcontrol,

		struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct filter_control *fc =

			(struct filter_control *)kcontrol->private_value;

	unsigned int i;

sound/soc/codecs/adav80x.c

+2 −2
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static int adav80x_set_deemph(struct snd_soc_codec *codec) 
static int adav80x_put_deemph(struct snd_kcontrol *kcontrol,

		struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);

	unsigned int deemph = ucontrol->value.enumerated.item[0];
@@ -330,7 +330,7 @@ static int adav80x_put_deemph(struct snd_kcontrol *kcontrol, 
static int adav80x_get_deemph(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);



	ucontrol->value.enumerated.item[0] = adav80x->deemph;

sound/soc/codecs/ak4641.c

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static int ak4641_set_deemph(struct snd_soc_codec *codec) 
static int ak4641_put_deemph(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct ak4641_priv *ak4641 = snd_soc_codec_get_drvdata(codec);

	int deemph = ucontrol->value.enumerated.item[0];
@@ -89,7 +89,7 @@ static int ak4641_put_deemph(struct snd_kcontrol *kcontrol, 
static int ak4641_get_deemph(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct ak4641_priv *ak4641 = snd_soc_codec_get_drvdata(codec);



	ucontrol->value.enumerated.item[0] = ak4641->deemph;