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

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

Merge remote-tracking branch 'asoc/topic/w-codec' into asoc-next

parents 10300474 60d66c9a

include/sound/rt5677.h

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ struct rt5677_platform_data { 
		OFF, GPIO4, GPIO5 and GPIO6 respectively */

	unsigned int jd2_gpio;

	unsigned int jd3_gpio;



	/* Set MICBIAS1 VDD 1v8 or 3v3 */

	bool micbias1_vdd_3v3;

};



#endif

include/sound/soc-dapm.h

+0 −1
Original line number Diff line number Diff line
@@ -525,7 +525,6 @@ struct snd_soc_dapm_widget { 
	enum snd_soc_dapm_type id;

	const char *name;		/* widget name */

	const char *sname;	/* stream name */

	struct snd_soc_codec *codec;

	struct list_head list;

	struct snd_soc_dapm_context *dapm;

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

+2 −2
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ static int snd_soc_put_volsw_2r_out(struct snd_kcontrol *kcontrol, 
static int pm860x_rsync_event(struct snd_soc_dapm_widget *w,

			      struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);



	/*

	 * In order to avoid current on the load, mute power-on and power-off
@@ -403,7 +403,7 @@ static int pm860x_rsync_event(struct snd_soc_dapm_widget *w, 
static int pm860x_dac_event(struct snd_soc_dapm_widget *w,

			    struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	unsigned int dac = 0;

	int data;

sound/soc/codecs/ak4671.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static const struct snd_kcontrol_new ak4671_snd_controls[] = { 
static int ak4671_out2_event(struct snd_soc_dapm_widget *w,

		struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);



	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

sound/soc/codecs/alc5623.c

+5 −3
Original line number Diff line number Diff line
@@ -55,18 +55,20 @@ static inline int alc5623_reset(struct snd_soc_codec *codec) 
static int amp_mixer_event(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);



	/* to power-on/off class-d amp generators/speaker */

	/* need to write to 'index-46h' register :        */

	/* so write index num (here 0x46) to reg 0x6a     */

	/* and then 0xffff/0 to reg 0x6c                  */

	snd_soc_write(w->codec, ALC5623_HID_CTRL_INDEX, 0x46);

	snd_soc_write(codec, ALC5623_HID_CTRL_INDEX, 0x46);



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		snd_soc_write(w->codec, ALC5623_HID_CTRL_DATA, 0xFFFF);

		snd_soc_write(codec, ALC5623_HID_CTRL_DATA, 0xFFFF);

		break;

	case SND_SOC_DAPM_POST_PMD:

		snd_soc_write(w->codec, ALC5623_HID_CTRL_DATA, 0);

		snd_soc_write(codec, ALC5623_HID_CTRL_DATA, 0);

		break;

	}