aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-08-20 18:07:01 +0200
committerJiri Kosina <jkosina@suse.cz>2018-08-20 18:07:01 +0200
commit4435b5774cdf9b3547934333e8facbb3fc1057be (patch)
tree41ffa9a86d6d801fe935f600a91dedce8d5be628 /include
parentMerge branch 'for-4.19/elan' into for-linus (diff)
parentHID: i2c-hid: Add vddl regulator control (diff)
downloadlinux-dev-4435b5774cdf9b3547934333e8facbb3fc1057be.tar.xz
linux-dev-4435b5774cdf9b3547934333e8facbb3fc1057be.zip
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.h7
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;
};