Message ID | 01367c4f4f1e174fefbef9aac645f6792bda07e5.1544466940.git-series.plaes@plaes.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | This is a second edition of a series that implements voltage | expand |
On Mon, Dec 10, 2018 at 08:42:12PM +0200, Priit Laes wrote: > Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> > Signed-off-by: Priit Laes <plaes@plaes.org> > Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org> What's going on with this patch? Will you be applying it or is this an ack for it to be applied with the rest of the series?
On Thu, 13 Dec 2018, Mark Brown wrote: > On Mon, Dec 10, 2018 at 08:42:12PM +0200, Priit Laes wrote: > > > Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> > > Signed-off-by: Priit Laes <plaes@plaes.org> > > Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org> > > What's going on with this patch? Will you be applying it or is this an > ack for it to be applied with the rest of the series? I don't have anything else queued for include/linux/mfd/axp20x.h, so you can take it if you want. Just make sure you 's/-for-MFD//'.
On Thu, Dec 13, 2018 at 01:28:02PM +0000, Lee Jones wrote: > On Thu, 13 Dec 2018, Mark Brown wrote: > > What's going on with this patch? Will you be applying it or is this an > > ack for it to be applied with the rest of the series? > I don't have anything else queued for include/linux/mfd/axp20x.h, so > you can take it if you want. Just make sure you 's/-for-MFD//'. Great, thanks!
diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h index 2302b62..a353cd2 100644 --- a/include/linux/mfd/axp20x.h +++ b/include/linux/mfd/axp20x.h @@ -35,7 +35,7 @@ enum axp20x_variants { #define AXP152_ALDO_OP_MODE 0x13 #define AXP152_LDO0_CTRL 0x15 #define AXP152_DCDC2_V_OUT 0x23 -#define AXP152_DCDC2_V_SCAL 0x25 +#define AXP152_DCDC2_V_RAMP 0x25 #define AXP152_DCDC1_V_OUT 0x26 #define AXP152_DCDC3_V_OUT 0x27 #define AXP152_ALDO12_V_OUT 0x28 @@ -53,7 +53,7 @@ enum axp20x_variants { #define AXP20X_USB_OTG_STATUS 0x02 #define AXP20X_PWR_OUT_CTRL 0x12 #define AXP20X_DCDC2_V_OUT 0x23 -#define AXP20X_DCDC2_LDO3_V_SCAL 0x25 +#define AXP20X_DCDC2_LDO3_V_RAMP 0x25 #define AXP20X_DCDC3_V_OUT 0x27 #define AXP20X_LDO24_V_OUT 0x28 #define AXP20X_LDO3_V_OUT 0x29