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

Commit ba252af8 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/asoc' into for-linus 

* topic/asoc: (135 commits)
  ASoC: Apostrophe patrol
  ASoC: codec tlv320aic23 fix bogus divide by 0 message
  ASoC: fix NULL pointer dereference in soc_suspend()
  ASoC: Fix build error in twl4030.c
  ASoC: SSM2602: assign last substream to the master when shutting down
  ASoC: Blackfin: document how anomaly 05000250 is handled
  ASoC: Blackfin: set the transfer size according the ac97_frame size
  ASoC: SSM2602: remove unsupported sample rates
  ASoC: TWL4030: Check the interface format for 4 channel mode
  ASoC: TWL4030: Use reg_cache in twl4030_init_chip
  ASoC: Initialise dev for the dummy S/PDIF DAI
  ASoC: Add dummy S/PDIF codec support
  ASoC: correct print specifiers for unsigneds
  ASoC: Modify mpc5200 AC97 driver to use V9 of spin_event_timeout()
  ASoC: Switch FSL SSI DAI over to symmetric_rates
  ASoC: Mark MPC5200 AC97 as BROKEN until PowerPC merge issues are resolved
  ASoC: Fabric bindings for STAC9766 on the Efika
  ASoC: Support for AC97 on Phytec pmc030 base board.
  ASoC: AC97 driver for mpc5200
  ASoC: Main rewite of the mpc5200 audio DMA code
  ...
parents 07a2039b 74b8f955

Documentation/sound/alsa/soc/dapm.txt

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ Audio DAPM widgets fall into a number of types:- 
 o Mic        - Mic (and optional Jack)

 o Line       - Line Input/Output (and optional Jack)

 o Speaker    - Speaker

 o Supply     - Power or clock supply widget used by other widgets.

 o Pre        - Special PRE widget (exec before all others)

 o Post       - Special POST widget (exec after all others)

MAINTAINERS

+4 −2
Original line number Diff line number Diff line
@@ -4574,7 +4574,8 @@ F: drivers/pcmcia/pxa2xx* 
F:	drivers/spi/pxa2xx*

F:	drivers/usb/gadget/pxa2*

F:	include/sound/pxa2xx-lib.h

F:	sound/soc/pxa/pxa2xx*

F:	sound/arm/pxa*

F:	sound/soc/pxa



PXA168 SUPPORT

P:	Eric Miao
@@ -5302,11 +5303,12 @@ P: Liam Girdwood 
M:	lrg@slimlogic.co.uk

P:	Mark Brown

M:	broonie@opensource.wolfsonmicro.com

T:	git git://opensource.wolfsonmicro.com/linux-2.6-asoc

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git

L:	alsa-devel@alsa-project.org (subscribers-only)

W:	http://alsa-project.org/main/index.php/ASoC

S:	Supported

F:	sound/soc/

F:	include/sound/soc*



SPARC + UltraSPARC (sparc/sparc64)

P:	David S. Miller

arch/powerpc/include/asm/mpc52xx_psc.h

+11 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ 
#define MPC52xx_PSC_MAXNUM	6



/* Programmable Serial Controller (PSC) status register bits */

#define MPC52xx_PSC_SR_UNEX_RX	0x0001

#define MPC52xx_PSC_SR_DATA_VAL	0x0002

#define MPC52xx_PSC_SR_DATA_OVR	0x0004

#define MPC52xx_PSC_SR_CMDSEND	0x0008

#define MPC52xx_PSC_SR_CDE	0x0080

#define MPC52xx_PSC_SR_RXRDY	0x0100

#define MPC52xx_PSC_SR_RXFULL	0x0200
@@ -61,6 +65,12 @@ 
#define MPC52xx_PSC_RXTX_FIFO_EMPTY	0x0001



/* PSC interrupt status/mask bits */

#define MPC52xx_PSC_IMR_UNEX_RX_SLOT 0x0001

#define MPC52xx_PSC_IMR_DATA_VALID	0x0002

#define MPC52xx_PSC_IMR_DATA_OVR	0x0004

#define MPC52xx_PSC_IMR_CMD_SEND	0x0008

#define MPC52xx_PSC_IMR_ERROR		0x0040

#define MPC52xx_PSC_IMR_DEOF		0x0080

#define MPC52xx_PSC_IMR_TXRDY		0x0100

#define MPC52xx_PSC_IMR_RXRDY		0x0200

#define MPC52xx_PSC_IMR_DB		0x0400
@@ -117,6 +127,7 @@ 
#define MPC52xx_PSC_SICR_SIM_FIR		(0x6 << 24)

#define MPC52xx_PSC_SICR_SIM_CODEC_24		(0x7 << 24)

#define MPC52xx_PSC_SICR_SIM_CODEC_32		(0xf << 24)

#define MPC52xx_PSC_SICR_AWR			(1 << 30)

#define MPC52xx_PSC_SICR_GENCLK			(1 << 23)

#define MPC52xx_PSC_SICR_I2S			(1 << 22)

#define MPC52xx_PSC_SICR_CLKPOL			(1 << 21)

include/sound/soc-dai.h

+7 −23
Original line number Diff line number Diff line
@@ -44,24 +44,6 @@ struct snd_pcm_substream; 
#define SND_SOC_DAIFMT_CONT		(0 << 4) /* continuous clock */

#define SND_SOC_DAIFMT_GATED		(1 << 4) /* clock is gated */



/*

 * DAI Left/Right Clocks.

 *

 * Specifies whether the DAI can support different samples for similtanious

 * playback and capture. This usually requires a seperate physical frame

 * clock for playback and capture.

 */

#define SND_SOC_DAIFMT_SYNC		(0 << 5) /* Tx FRM = Rx FRM */

#define SND_SOC_DAIFMT_ASYNC		(1 << 5) /* Tx FRM ~ Rx FRM */



/*

 * TDM

 *

 * Time Division Multiplexing. Allows PCM data to be multplexed with other

 * data on the DAI.

 */

#define SND_SOC_DAIFMT_TDM		(1 << 6)



/*

 * DAI hardware signal inversions.

 *
@@ -96,6 +78,10 @@ struct snd_pcm_substream; 
#define SND_SOC_CLOCK_IN		0

#define SND_SOC_CLOCK_OUT		1



#define SND_SOC_STD_AC97_FMTS (SNDRV_PCM_FMTBIT_S16_LE |\

                               SNDRV_PCM_FMTBIT_S32_LE |\

                               SNDRV_PCM_FMTBIT_S32_BE)



struct snd_soc_dai_ops;

struct snd_soc_dai;

struct snd_ac97_bus_ops;
@@ -208,6 +194,7 @@ struct snd_soc_dai { 
	/* DAI capabilities */

	struct snd_soc_pcm_stream capture;

	struct snd_soc_pcm_stream playback;

	unsigned int symmetric_rates:1;



	/* DAI runtime info */

	struct snd_pcm_runtime *runtime;
@@ -219,11 +206,8 @@ struct snd_soc_dai { 
	/* DAI private data */

	void *private_data;



	/* parent codec/platform */

	union {

		struct snd_soc_codec *codec;

	/* parent platform */

	struct snd_soc_platform *platform;

	};



	struct list_head list;

};

include/sound/soc-dapm.h

+21 −3
Original line number Diff line number Diff line
@@ -140,16 +140,30 @@ 
#define SND_SOC_DAPM_DAC(wname, stname, wreg, wshift, winvert) \

{	.id = snd_soc_dapm_dac, .name = wname, .sname = stname, .reg = wreg, \

	.shift = wshift, .invert = winvert}

#define SND_SOC_DAPM_DAC_E(wname, stname, wreg, wshift, winvert, \

			   wevent, wflags)				\

{	.id = snd_soc_dapm_dac, .name = wname, .sname = stname, .reg = wreg, \

	.shift = wshift, .invert = winvert, \

	.event = wevent, .event_flags = wflags}

#define SND_SOC_DAPM_ADC(wname, stname, wreg, wshift, winvert) \

{	.id = snd_soc_dapm_adc, .name = wname, .sname = stname, .reg = wreg, \

	.shift = wshift, .invert = winvert}

#define SND_SOC_DAPM_ADC_E(wname, stname, wreg, wshift, winvert, \

			   wevent, wflags)				\

{	.id = snd_soc_dapm_adc, .name = wname, .sname = stname, .reg = wreg, \

	.shift = wshift, .invert = winvert, \

	.event = wevent, .event_flags = wflags}



/* generic register modifier widget */

/* generic widgets */

#define SND_SOC_DAPM_REG(wid, wname, wreg, wshift, wmask, won_val, woff_val) \

{	.id = wid, .name = wname, .kcontrols = NULL, .num_kcontrols = 0, \

	.reg = -((wreg) + 1), .shift = wshift, .mask = wmask, \

	.on_val = won_val, .off_val = woff_val, .event = dapm_reg_event, \

	.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD}

#define SND_SOC_DAPM_SUPPLY(wname, wreg, wshift, winvert, wevent, wflags) \

{	.id = snd_soc_dapm_supply, .name = wname, .reg = wreg,	\

	.shift = wshift, .invert = winvert, .event = wevent, \

	.event_flags = wflags}



/* dapm kcontrol types */

#define SOC_DAPM_SINGLE(xname, reg, shift, max, invert) \
@@ -265,8 +279,6 @@ int snd_soc_dapm_add_routes(struct snd_soc_codec *codec, 
/* dapm events */

int snd_soc_dapm_stream_event(struct snd_soc_codec *codec, char *stream,

	int event);

int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev,

	enum snd_soc_bias_level level);



/* dapm sys fs - used by the core */

int snd_soc_dapm_sys_add(struct device *dev);
@@ -298,6 +310,7 @@ enum snd_soc_dapm_type { 
	snd_soc_dapm_vmid,			/* codec bias/vmid - to minimise pops */

	snd_soc_dapm_pre,			/* machine specific pre widget - exec first */

	snd_soc_dapm_post,			/* machine specific post widget - exec last */

	snd_soc_dapm_supply,		/* power/clock supply */

};



/*
@@ -357,6 +370,8 @@ struct snd_soc_dapm_widget { 
	unsigned char suspend:1;		/* was active before suspend */

	unsigned char pmdown:1;			/* waiting for timeout */



	int (*power_check)(struct snd_soc_dapm_widget *w);



	/* external events */

	unsigned short event_flags;		/* flags to specify event types */

	int (*event)(struct snd_soc_dapm_widget*, struct snd_kcontrol *, int);
@@ -368,6 +383,9 @@ struct snd_soc_dapm_widget { 
	/* widget input and outputs */

	struct list_head sources;

	struct list_head sinks;



	/* used during DAPM updates */

	struct list_head power_list;

};



#endif