Merge branch 'regulator-5.2' into regulator-linus
This commit is contained in:
@@ -20,6 +20,7 @@
|
||||
#define MIN_850_MV 850000
|
||||
#define MIN_800_MV 800000
|
||||
#define MIN_750_MV 750000
|
||||
#define MIN_650_MV 650000
|
||||
#define MIN_600_MV 600000
|
||||
#define MIN_500_MV 500000
|
||||
|
||||
|
@@ -170,7 +170,9 @@ enum s2mps11_regulators {
|
||||
#define S2MPS11_ENABLE_MASK (0x03 << S2MPS11_ENABLE_SHIFT)
|
||||
#define S2MPS11_ENABLE_SHIFT 0x06
|
||||
#define S2MPS11_LDO_N_VOLTAGES (S2MPS11_LDO_VSEL_MASK + 1)
|
||||
#define S2MPS11_BUCK_N_VOLTAGES (S2MPS11_BUCK_VSEL_MASK + 1)
|
||||
#define S2MPS11_BUCK12346_N_VOLTAGES 153
|
||||
#define S2MPS11_BUCK5_N_VOLTAGES 216
|
||||
#define S2MPS11_BUCK7810_N_VOLTAGES 225
|
||||
#define S2MPS11_BUCK9_N_VOLTAGES (S2MPS11_BUCK9_VSEL_MASK + 1)
|
||||
#define S2MPS11_RAMP_DELAY 25000 /* uV/us */
|
||||
|
||||
|
Reference in New Issue
Block a user