Merge tag 'for-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...

[sfrench/cifs-2.6.git] / include / linux / mfd / axp20x.h

diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
index 2302b620d23888e894877955c61c39a0f94ca29a..a353cd22b388e04db3332de9e8bfb5bada42d6e5 100644 (file)
--- 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