Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next
This commit is contained in:
@@ -74,6 +74,7 @@ enum max77686_regulators {
|
||||
struct max77686_regulator_data {
|
||||
int id;
|
||||
struct regulator_init_data *initdata;
|
||||
struct device_node *of_node;
|
||||
};
|
||||
|
||||
enum max77686_opmode {
|
||||
|
@@ -14,6 +14,7 @@
|
||||
#define TPS6586X_SLEW_RATE_MASK 0x07
|
||||
|
||||
enum {
|
||||
TPS6586X_ID_SYS,
|
||||
TPS6586X_ID_SM_0,
|
||||
TPS6586X_ID_SM_1,
|
||||
TPS6586X_ID_SM_2,
|
||||
|
Reference in New Issue
Block a user