diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-05-23 01:37:59 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-23 01:37:59 +0200 |
| commit | 599ed4b0aeceb6d45ea33f64639e745e3da72766 (patch) | |
| tree | d1d68299eacda3b12097bd3a7d4e7c895e3d6a13 /sound/soc/omap/mcbsp.h | |
| parent | 85e184e4c3cd3e2285ceab91ff8f0cac094e8a85 (diff) | |
| parent | ced47a3117ba084b404f3fc28de3ef6eaba1b911 (diff) | |
| download | linux-599ed4b0aeceb6d45ea33f64639e745e3da72766.tar.gz linux-599ed4b0aeceb6d45ea33f64639e745e3da72766.tar.bz2 linux-599ed4b0aeceb6d45ea33f64639e745e3da72766.zip | |
Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc into topic/asoc
Diffstat (limited to 'sound/soc/omap/mcbsp.h')
| -rw-r--r-- | sound/soc/omap/mcbsp.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h index a944fcc9073c..262a6152111f 100644 --- a/sound/soc/omap/mcbsp.h +++ b/sound/soc/omap/mcbsp.h @@ -217,17 +217,20 @@ enum { /********************** McBSP DMA operating modes **************************/ #define MCBSP_DMA_MODE_ELEMENT 0 #define MCBSP_DMA_MODE_THRESHOLD 1 -#define MCBSP_DMA_MODE_FRAME 2 -/********************** McBSP WAKEUPEN bit definitions *********************/ +/********************** McBSP WAKEUPEN/IRQST/IRQEN bit definitions *********/ #define RSYNCERREN BIT(0) #define RFSREN BIT(1) #define REOFEN BIT(2) #define RRDYEN BIT(3) +#define RUNDFLEN BIT(4) +#define ROVFLEN BIT(5) #define XSYNCERREN BIT(7) #define XFSXEN BIT(8) #define XEOFEN BIT(9) #define XRDYEN BIT(10) +#define XUNDFLEN BIT(11) +#define XOVFLEN BIT(12) #define XEMPTYEOFEN BIT(14) /* Clock signal muxing options */ @@ -295,6 +298,7 @@ struct omap_mcbsp { int configured; u8 free; + int irq; int rx_irq; int tx_irq; |