On Tue, 11 Dec 2018, Priit Laes wrote: > From: Olliver Schinagl <oliver@xxxxxxxxxxx> > > The current axp20x names the ramping register 'scal' which probably > means scaling. Since the register really has nothing to do with > scaling, but really is the voltage ramp we rename it appropriately. > > Signed-off-by: Olliver Schinagl <oliver@xxxxxxxxxxx> > Signed-off-by: Priit Laes <plaes@xxxxxxxxx> > Acked-for-MFD-by: Lee Jones <lee.jones@xxxxxxxxxx> > --- > include/linux/mfd/axp20x.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) I've lost track of what's happening with this set now. Mark, Did you take this patch in the end? > 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 -- Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog