| commit | 7375f4007f7f0be439e9956ae429cdd4dd80b537 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Tue Jan 06 10:48:32 2015 -0500 |
| committer | Tom Rini <trini@ti.com> | Tue Jan 06 10:48:32 2015 -0500 |
| tree | dc230c35a77782a5fb9bcda426eccb2102652f52 | |
| parent | 2ed3f9114300b1f11f1f30d9d2478146afc3af0e [diff] | |
| parent | 5ba471944abc63e837a29c905ac46ae362d5f6a5 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
diff --git a/include/axp221.h b/include/axp221.h index e3b4409..26d25ff 100644 --- 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);