diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2018-05-21 16:52:40 +0200 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2018-05-21 16:52:40 +0200 |
| commit | 9e3699fcfd385b61b56408105f33c72b14442624 (patch) | |
| tree | 010b2f37b42590e8ab4ea2c675c27c33aaee33e1 /include | |
| parent | hwmon: (ltc2990) support all measurement modes (diff) | |
| parent | hwmon: MC13783: Add uid and die temperature sensor inputs (diff) | |
| download | linux-9e3699fcfd385b61b56408105f33c72b14442624.tar.xz linux-9e3699fcfd385b61b56408105f33c72b14442624.zip | |
Merge tag 'ib-mfd-hwmon-v4.18' into hwmon-next
Immutable branch between MFD and HWMON due for the v4.18 merge window
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/mc13xxx.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h index 638222e43e48..54a3cd808f9e 100644 --- a/include/linux/mfd/mc13xxx.h +++ b/include/linux/mfd/mc13xxx.h @@ -243,6 +243,8 @@ struct mc13xxx_platform_data { #define MC13XXX_ADC0_LICELLCON (1 << 0) #define MC13XXX_ADC0_CHRGICON (1 << 1) #define MC13XXX_ADC0_BATICON (1 << 2) +#define MC13XXX_ADC0_ADIN7SEL_DIE (1 << 4) +#define MC13XXX_ADC0_ADIN7SEL_UID (2 << 4) #define MC13XXX_ADC0_ADREFEN (1 << 10) #define MC13XXX_ADC0_TSMOD0 (1 << 12) #define MC13XXX_ADC0_TSMOD1 (1 << 13) |