diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-11-04 08:53:04 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-11-04 08:53:04 +0100 |
commit | 649e441f49d4bfb717e9467950891dc452f4e063 (patch) | |
tree | 2bdfdca65519db2f350c236cbbd65f24d5746cad /sound/soc/codecs/rt5514-spi.h | |
parent | 42f930da7f00c0ab23df4c7aed36137f35988980 (diff) | |
parent | 5cb0512c02ecd7e6214e912e4c150f4219ac78e0 (diff) |
Merge branch 'linus' into core/urgent, to pick up dependent commits
We want to fix an objtool build warning that got introduced in the latest upstream kernel.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'sound/soc/codecs/rt5514-spi.h')
-rw-r--r-- | sound/soc/codecs/rt5514-spi.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5514-spi.h b/sound/soc/codecs/rt5514-spi.h index a6434ee6ff03..c1a36647c119 100644 --- a/sound/soc/codecs/rt5514-spi.h +++ b/sound/soc/codecs/rt5514-spi.h @@ -20,6 +20,9 @@ #define RT5514_BUFFER_VOICE_BASE 0x18000200 #define RT5514_BUFFER_VOICE_LIMIT 0x18000204 #define RT5514_BUFFER_VOICE_WP 0x1800020c +#define RT5514_IRQ_CTRL 0x18002094 + +#define RT5514_IRQ_STATUS_BIT (0x1 << 5) /* SPI Command */ enum { |