Merge branch 'master' of git://git.denx.de/u-boot-sunxi

diff --git a/include/axp221.h b/include/axp221.h
index e3b4409a95fe7e234a7b86d954d32343bf9b8d0c..26d25ff52e81f45f39c3b3dec0f87a03d4e91ab4 100644 (file)
--- a/include/axp221.h
+++ b/include/axp221.h
@@ -32,7 +32,7 @@
 #define AXP221_DCDC4_CTRL      0x24
 #define AXP221_DCDC5_CTRL      0x25
 #define AXP221_ALDO1_CTRL      0x28
-#define AXP221_ALDO2_CTRL      0x28
+#define AXP221_ALDO2_CTRL      0x29
 #define AXP221_ALDO3_CTRL      0x2a
 
 int axp221_set_dcdc1(unsigned int mvolt);