diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-26 19:09:30 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-26 19:09:30 -0400 |
| commit | 8c876be81a1f2f0ab33ffb2b00871e65c7a658b3 (patch) | |
| tree | 60426265759ab14b00c94a791520f140062bb57c /include | |
| parent | 02dbd0ff5448d4da0c6e9d59c897f3e31a16d51a (diff) | |
| parent | 347e0899b1c75d907f01ac883ca38d37fe9bfa42 (diff) | |
Merge branch 'char-misc-linus' into char-misc-next
This picks up the MEI fixes that we need in this branch now.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/max77693-private.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h index 5b18ecde69b5..1aa4f13cdfa6 100644 --- a/include/linux/mfd/max77693-private.h +++ b/include/linux/mfd/max77693-private.h | |||
| @@ -106,6 +106,29 @@ enum max77693_muic_reg { | |||
| 106 | MAX77693_MUIC_REG_END, | 106 | MAX77693_MUIC_REG_END, |
| 107 | }; | 107 | }; |
| 108 | 108 | ||
| 109 | /* MAX77693 INTMASK1~2 Register */ | ||
| 110 | #define INTMASK1_ADC1K_SHIFT 3 | ||
| 111 | #define INTMASK1_ADCERR_SHIFT 2 | ||
| 112 | #define INTMASK1_ADCLOW_SHIFT 1 | ||
| 113 | #define INTMASK1_ADC_SHIFT 0 | ||
| 114 | #define INTMASK1_ADC1K_MASK (1 << INTMASK1_ADC1K_SHIFT) | ||
| 115 | #define INTMASK1_ADCERR_MASK (1 << INTMASK1_ADCERR_SHIFT) | ||
| 116 | #define INTMASK1_ADCLOW_MASK (1 << INTMASK1_ADCLOW_SHIFT) | ||
| 117 | #define INTMASK1_ADC_MASK (1 << INTMASK1_ADC_SHIFT) | ||
| 118 | |||
| 119 | #define INTMASK2_VIDRM_SHIFT 5 | ||
| 120 | #define INTMASK2_VBVOLT_SHIFT 4 | ||
| 121 | #define INTMASK2_DXOVP_SHIFT 3 | ||
| 122 | #define INTMASK2_DCDTMR_SHIFT 2 | ||
| 123 | #define INTMASK2_CHGDETRUN_SHIFT 1 | ||
| 124 | #define INTMASK2_CHGTYP_SHIFT 0 | ||
| 125 | #define INTMASK2_VIDRM_MASK (1 << INTMASK2_VIDRM_SHIFT) | ||
| 126 | #define INTMASK2_VBVOLT_MASK (1 << INTMASK2_VBVOLT_SHIFT) | ||
| 127 | #define INTMASK2_DXOVP_MASK (1 << INTMASK2_DXOVP_SHIFT) | ||
| 128 | #define INTMASK2_DCDTMR_MASK (1 << INTMASK2_DCDTMR_SHIFT) | ||
| 129 | #define INTMASK2_CHGDETRUN_MASK (1 << INTMASK2_CHGDETRUN_SHIFT) | ||
| 130 | #define INTMASK2_CHGTYP_MASK (1 << INTMASK2_CHGTYP_SHIFT) | ||
| 131 | |||
| 109 | /* MAX77693 MUIC - STATUS1~3 Register */ | 132 | /* MAX77693 MUIC - STATUS1~3 Register */ |
| 110 | #define STATUS1_ADC_SHIFT (0) | 133 | #define STATUS1_ADC_SHIFT (0) |
| 111 | #define STATUS1_ADCLOW_SHIFT (5) | 134 | #define STATUS1_ADCLOW_SHIFT (5) |