Merge remote-tracking branch 'regulator/topic/core' into regulator-next

2017-04-30 22:17:23 +09:00
parent 6a8007c83a c93609ab39
commit bde1e61b8e
3 changed files with 18 additions and 19 deletions
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -429,6 +429,8 @@ struct regulator_dev {
 	struct regulator_enable_gpio *ena_pin;
 	unsigned int ena_gpio_state:1;

+	unsigned int is_switch:1;
+
 	/* time when this regulator was disabled last time */
 	unsigned long last_off_jiffy;
 };