diff options
| author | Tom Rini <trini@konsulko.com> | 2016-04-01 08:17:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-01 08:17:55 -0400 |
| commit | 40345e9ea74b0caef06f205364bb2cf93528cc40 (patch) | |
| tree | 9f19a59f6580893d10933c3c9275552bd613cdcf /include/axp221.h | |
| parent | 7f5b1e9bd952ebdac917264f03522371a473b60c (diff) | |
| parent | 3ffe39ed2b66af71c7271d0cef2a248b5bf7dfdb (diff) | |
| download | blackbird-obmc-uboot-40345e9ea74b0caef06f205364bb2cf93528cc40.tar.gz blackbird-obmc-uboot-40345e9ea74b0caef06f205364bb2cf93528cc40.zip | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'include/axp221.h')
| -rw-r--r-- | include/axp221.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/axp221.h b/include/axp221.h index 04cd8c2be4..b4b64b0e87 100644 --- a/include/axp221.h +++ b/include/axp221.h @@ -43,12 +43,8 @@ #define AXP221_ALDO1_CTRL 0x28 #define AXP221_ALDO2_CTRL 0x29 #define AXP221_ALDO3_CTRL 0x2a -#define AXP221_VBUS_IPSOUT 0x30 -#define AXP221_VBUS_IPSOUT_DRIVEBUS (1 << 2) #define AXP221_SHUTDOWN 0x32 #define AXP221_SHUTDOWN_POWEROFF (1 << 7) -#define AXP221_MISC_CTRL 0x8f -#define AXP221_MISC_CTRL_N_VBUSEN_FUNC (1 << 4) #define AXP221_PAGE 0xff /* Page 1 addresses */ @@ -57,6 +53,10 @@ /* For axp_gpio.c */ #define AXP_POWER_STATUS 0x00 #define AXP_POWER_STATUS_VBUS_PRESENT (1 << 5) +#define AXP_VBUS_IPSOUT 0x30 +#define AXP_VBUS_IPSOUT_DRIVEBUS (1 << 2) +#define AXP_MISC_CTRL 0x8f +#define AXP_MISC_CTRL_N_VBUSEN_FUNC (1 << 4) #define AXP_GPIO0_CTRL 0x90 #define AXP_GPIO1_CTRL 0x92 #define AXP_GPIO_CTRL_OUTPUT_LOW 0x00 /* Drive pin low */ |
