diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-08 05:43:31 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-08 05:43:31 -0500 |
| commit | efdf09add98821380794a3318270bf07c7aff4d2 (patch) | |
| tree | 942f3ed1a4bef6207543caea36f801e114b1a496 /include/linux | |
| parent | c462b1d8bba7923d2df7c267283567039c212610 (diff) | |
| parent | bb7838d4f13c50df8ef7324f5fd4aeb729269e22 (diff) | |
Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/mc13xxx.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h index 41ed59276c00..67c17b5a6f44 100644 --- a/include/linux/mfd/mc13xxx.h +++ b/include/linux/mfd/mc13xxx.h | |||
| @@ -41,6 +41,13 @@ int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx, | |||
| 41 | unsigned int mode, unsigned int channel, | 41 | unsigned int mode, unsigned int channel, |
| 42 | u8 ato, bool atox, unsigned int *sample); | 42 | u8 ato, bool atox, unsigned int *sample); |
| 43 | 43 | ||
| 44 | #define MC13783_AUDIO_RX0 36 | ||
| 45 | #define MC13783_AUDIO_RX1 37 | ||
| 46 | #define MC13783_AUDIO_TX 38 | ||
| 47 | #define MC13783_SSI_NETWORK 39 | ||
| 48 | #define MC13783_AUDIO_CODEC 40 | ||
| 49 | #define MC13783_AUDIO_DAC 41 | ||
| 50 | |||
| 44 | #define MC13XXX_IRQ_ADCDONE 0 | 51 | #define MC13XXX_IRQ_ADCDONE 0 |
| 45 | #define MC13XXX_IRQ_ADCBISDONE 1 | 52 | #define MC13XXX_IRQ_ADCBISDONE 1 |
| 46 | #define MC13XXX_IRQ_TS 2 | 53 | #define MC13XXX_IRQ_TS 2 |