diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-04 14:48:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-04 14:48:27 -0400 |
| commit | 24d734a2ba5133f55feb7f7df7530d4f5aa6518f (patch) | |
| tree | e20d9cec46cb3f55f6ab0cc23bf13dd3ab3ff76c /include/linux/platform_data | |
| parent | 17ece345a042347224e50032e959ad3959638b21 (diff) | |
| parent | 44b413661b57cbbb7e4c3adf7b087fada42a443e (diff) | |
Merge tag 'hwmon-for-linus-v4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
- Add PMBus client driver for IR35221
- Add support for NCT6795D to nct6775 driver
- Functional improvements to adt7475, aspeed-pwm-tacho, and ibmpowernv
drivers
- Minor fixes and cleanups in various drivers
* tag 'hwmon-for-linus-v4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (22 commits)
hwmon: (aspeed-pwm-tacho) Poll with short sleeps.
hwmon: (aspeed-pwm-tacho) reduce fan_tach period
hwmon: (ibmpowernv) Add current(A) sensor
hwmon: (ibmpowernv) introduce a legacy_compatibles array
hwmon: (pwm-fan) Switch to new atomic PWM API
hwmon: (scpi) Fix the scale of SCP sensor readings
hwmon: (aspeed-pwm-tacho) Enable both edge measurement.
hwmon: (ibmpowernv) Add highest/lowest attributes to sensors
hwmon: (pmbus) move header file out of I2C realm
hwmon: (max6639) move header file out of I2C realm
hwmon: (ltc4245) move header file out of I2C realm
hwmon: (ds620) move header file out of I2C realm
hwmon: (ads1015) move header file out of I2C realm
hwmon: (adt7475) temperature smoothing
hwmon: (adt7475) add high frequency support
hwmon: (adt7475) fan stall prevention
hwmon: (adt7475) replace find_nearest() with find_closest()
hwmon: (pmbus) Add client driver for IR35221
hwmon: (nct6775) Add support for NCT6795D
hwmon: (nct6775) Improve fan detection
...
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/ads1015.h | 36 | ||||
| -rw-r--r-- | include/linux/platform_data/ds620.h | 21 | ||||
| -rw-r--r-- | include/linux/platform_data/ltc4245.h | 21 | ||||
| -rw-r--r-- | include/linux/platform_data/max6639.h | 14 |
4 files changed, 92 insertions, 0 deletions
diff --git a/include/linux/platform_data/ads1015.h b/include/linux/platform_data/ads1015.h new file mode 100644 index 000000000000..d5aa2a045669 --- /dev/null +++ b/include/linux/platform_data/ads1015.h | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | /* | ||
| 2 | * Platform Data for ADS1015 12-bit 4-input ADC | ||
| 3 | * (C) Copyright 2010 | ||
| 4 | * Dirk Eibach, Guntermann & Drunck GmbH <eibach@gdsys.de> | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License as published by | ||
| 8 | * the Free Software Foundation; either version 2 of the License, or | ||
| 9 | * (at your option) any later version. | ||
| 10 | * | ||
| 11 | * This program is distributed in the hope that it will be useful, | ||
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | * GNU General Public License for more details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU General Public License | ||
| 17 | * along with this program; if not, write to the Free Software | ||
| 18 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 19 | */ | ||
| 20 | |||
| 21 | #ifndef LINUX_ADS1015_H | ||
| 22 | #define LINUX_ADS1015_H | ||
| 23 | |||
| 24 | #define ADS1015_CHANNELS 8 | ||
| 25 | |||
| 26 | struct ads1015_channel_data { | ||
| 27 | bool enabled; | ||
| 28 | unsigned int pga; | ||
| 29 | unsigned int data_rate; | ||
| 30 | }; | ||
| 31 | |||
| 32 | struct ads1015_platform_data { | ||
| 33 | struct ads1015_channel_data channel_data[ADS1015_CHANNELS]; | ||
| 34 | }; | ||
| 35 | |||
| 36 | #endif /* LINUX_ADS1015_H */ | ||
diff --git a/include/linux/platform_data/ds620.h b/include/linux/platform_data/ds620.h new file mode 100644 index 000000000000..736bb87ac0fc --- /dev/null +++ b/include/linux/platform_data/ds620.h | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | #ifndef _LINUX_DS620_H | ||
| 2 | #define _LINUX_DS620_H | ||
| 3 | |||
| 4 | #include <linux/types.h> | ||
| 5 | #include <linux/i2c.h> | ||
| 6 | |||
| 7 | /* platform data for the DS620 temperature sensor and thermostat */ | ||
| 8 | |||
| 9 | struct ds620_platform_data { | ||
| 10 | /* | ||
| 11 | * Thermostat output pin PO mode: | ||
| 12 | * 0 = always low (default) | ||
| 13 | * 1 = PO_LOW | ||
| 14 | * 2 = PO_HIGH | ||
| 15 | * | ||
| 16 | * (see Documentation/hwmon/ds620) | ||
| 17 | */ | ||
| 18 | int pomode; | ||
| 19 | }; | ||
| 20 | |||
| 21 | #endif /* _LINUX_DS620_H */ | ||
diff --git a/include/linux/platform_data/ltc4245.h b/include/linux/platform_data/ltc4245.h new file mode 100644 index 000000000000..56bda4be0016 --- /dev/null +++ b/include/linux/platform_data/ltc4245.h | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | /* | ||
| 2 | * Platform Data for LTC4245 hardware monitor chip | ||
| 3 | * | ||
| 4 | * Copyright (c) 2010 Ira W. Snyder <iws@ovro.caltech.edu> | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify it | ||
| 7 | * under the terms of the GNU General Public License as published by the | ||
| 8 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 9 | * option) any later version. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #ifndef LINUX_LTC4245_H | ||
| 13 | #define LINUX_LTC4245_H | ||
| 14 | |||
| 15 | #include <linux/types.h> | ||
| 16 | |||
| 17 | struct ltc4245_platform_data { | ||
| 18 | bool use_extra_gpios; | ||
| 19 | }; | ||
| 20 | |||
| 21 | #endif /* LINUX_LTC4245_H */ | ||
diff --git a/include/linux/platform_data/max6639.h b/include/linux/platform_data/max6639.h new file mode 100644 index 000000000000..6011c42034da --- /dev/null +++ b/include/linux/platform_data/max6639.h | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | #ifndef _LINUX_MAX6639_H | ||
| 2 | #define _LINUX_MAX6639_H | ||
| 3 | |||
| 4 | #include <linux/types.h> | ||
| 5 | |||
| 6 | /* platform data for the MAX6639 temperature sensor and fan control */ | ||
| 7 | |||
| 8 | struct max6639_platform_data { | ||
| 9 | bool pwm_polarity; /* Polarity low (0) or high (1, default) */ | ||
| 10 | int ppr; /* Pulses per rotation 1..4 (default == 2) */ | ||
| 11 | int rpm_range; /* 2000, 4000 (default), 8000 or 16000 */ | ||
| 12 | }; | ||
| 13 | |||
| 14 | #endif /* _LINUX_MAX6639_H */ | ||
