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

Commit c503a04d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I8947f1ad,Ib9bef671,I72d16892,If77f8b37 into msm-next 

* changes:
  ASoC: core - add hostless DAI support
  ALSA: pcm - add support for hostless audio
  ALSA: jack: Add support to report second microphone
  ALSA: jack: Update supported jack switch types
parents 44b140ff a734fdbe

include/linux/mod_devicetable.h

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ struct pcmcia_device_id { 
#define INPUT_DEVICE_ID_LED_MAX		0x0f

#define INPUT_DEVICE_ID_SND_MAX		0x07

#define INPUT_DEVICE_ID_FF_MAX		0x7f

#define INPUT_DEVICE_ID_SW_MAX		0x0f

#define INPUT_DEVICE_ID_SW_MAX		0x20



#define INPUT_DEVICE_ID_MATCH_BUS	1

#define INPUT_DEVICE_ID_MATCH_VENDOR	2

include/sound/jack.h

+3 −3
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ enum snd_jack_types { 
	SND_JACK_OC_HPHL        = 0x0040,

	SND_JACK_OC_HPHR        = 0x0080,

	SND_JACK_UNSUPPORTED    = 0x0100,

	SND_JACK_MICROPHONE2    = 0x0200,

	SND_JACK_ANC_HEADPHONE  = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE |

				  SND_JACK_MICROPHONE2,



	/* Kept separate from switches to facilitate implementation */

	SND_JACK_BTN_0		= 0x4000,
@@ -71,9 +74,6 @@ enum snd_jack_types { 
	SND_JACK_BTN_5		= 0x0200,

};



/* Keep in sync with definitions above */

#define SND_JACK_SWITCH_TYPES 6



struct snd_jack {

	struct list_head kctl_list;

	struct snd_card *card;

include/sound/pcm.h

+1 −0
Original line number Diff line number Diff line
@@ -485,6 +485,7 @@ struct snd_pcm_substream { 
#endif /* CONFIG_SND_VERBOSE_PROCFS */

	/* misc flags */

	unsigned int hw_opened: 1;

	unsigned int hw_no_buffer: 1; /* substream may not have a buffer */

};



#define SUBSTREAM_BUSY(substream) ((substream)->ref_count > 0)

include/sound/soc.h

+10 −0
Original line number Diff line number Diff line
@@ -383,6 +383,10 @@ 
#define SND_SOC_COMP_ORDER_LATE		1

#define SND_SOC_COMP_ORDER_LAST		2



/* DAI Link Host Mode Support */

#define SND_SOC_DAI_LINK_NO_HOST		0x1

#define SND_SOC_DAI_LINK_OPT_HOST		0x2



/*

 * Bias levels

 *
@@ -1082,6 +1086,12 @@ struct snd_soc_dai_link { 
	/* This DAI link can route to other DAI links at runtime (Frontend)*/

	unsigned int dynamic:1;



	/*

	 * This DAI can support no host IO (no pcm data is

	 * copied to from host)

	 */

	unsigned int no_host_mode:2;



	/* DPCM capture and Playback support */

	unsigned int dpcm_capture:1;

	unsigned int dpcm_playback:1;

include/uapi/linux/input-event-codes.h

+5 −1
Original line number Diff line number Diff line
@@ -783,7 +783,11 @@ 
#define SW_LINEIN_INSERT	0x0d  /* set = inserted */

#define SW_MUTE_DEVICE		0x0e  /* set = device disabled */

#define SW_PEN_INSERTED		0x0f  /* set = pen inserted */

#define SW_MAX			0x0f

#define SW_HPHL_OVERCURRENT	0x10  /* set = over current on left hph */

#define SW_HPHR_OVERCURRENT	0x11  /* set = over current on right hph */

#define SW_MICROPHONE2_INSERT	0x12  /* set = inserted */

#define SW_UNSUPPORT_INSERT	0x13  /* set = unsupported device inserted */

#define SW_MAX			0x20

#define SW_CNT			(SW_MAX+1)



/*