diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-08-20 19:07:01 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-08-20 19:07:01 +0300 |
| commit | 4435b5774cdf9b3547934333e8facbb3fc1057be (patch) | |
| tree | 41ffa9a86d6d801fe935f600a91dedce8d5be628 /include | |
| parent | 5a12d86ce3a93b6442963e5f6e6511e8f470f760 (diff) | |
| parent | 6136f97cd2dd2b5a88d62bd73cc663a803124c09 (diff) | |
| download | linux-4435b5774cdf9b3547934333e8facbb3fc1057be.tar.xz | |
Merge branch 'for-4.19/i2c-hid' into for-linus
Low voltage support for i2c-hid
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/i2c-hid.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/platform_data/i2c-hid.h b/include/linux/platform_data/i2c-hid.h index 1fb088239d12..c628bb5e1061 100644 --- a/include/linux/platform_data/i2c-hid.h +++ b/include/linux/platform_data/i2c-hid.h @@ -12,14 +12,13 @@ #ifndef __LINUX_I2C_HID_H #define __LINUX_I2C_HID_H +#include <linux/regulator/consumer.h> #include <linux/types.h> -struct regulator; - /** * struct i2chid_platform_data - used by hid over i2c implementation. * @hid_descriptor_address: i2c register where the HID descriptor is stored. - * @supply: regulator for powering on the device. + * @supplies: regulators for powering on the device. * @post_power_delay_ms: delay after powering on before device is usable. * * Note that it is the responsibility of the platform driver (or the acpi 5.0 @@ -35,7 +34,7 @@ struct regulator; */ struct i2c_hid_platform_data { u16 hid_descriptor_address; - struct regulator *supply; + struct regulator_bulk_data supplies[2]; int post_power_delay_ms; }; |