diff options
author | Tom Rini <trini@konsulko.com> | 2021-10-25 12:09:57 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-10-25 12:09:57 -0400 |
commit | 397b35f09794e40d62d5e4f53992e2a711dc8be1 (patch) | |
tree | 0696b5205c1151a600643238cb9da1f93dd15806 /include/axp152.h | |
parent | 35a7677e382172e5024b38ff997944ca83909384 (diff) | |
parent | c846fe43f0561311eb7261b34023a04646cdbd0d (diff) |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
- Add and enable watchdog driver
- Prepare for SYSRESET driven AXP poweroff
- Prepare for SoCs without MMC2
- Some fixes for extending SPL (SPL-DM for RISC-V)
- Some preparations for proper VBUS management
- Fix secure monitor move
Diffstat (limited to 'include/axp152.h')
-rw-r--r-- | include/axp152.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/axp152.h b/include/axp152.h index c81f172502..10d845fec4 100644 --- a/include/axp152.h +++ b/include/axp152.h @@ -15,6 +15,7 @@ enum axp152_reg { #define AXP152_POWEROFF (1 << 7) /* For axp_gpio.c */ +#ifdef CONFIG_AXP152_POWER #define AXP_GPIO0_CTRL 0x90 #define AXP_GPIO1_CTRL 0x91 #define AXP_GPIO2_CTRL 0x92 @@ -24,3 +25,4 @@ enum axp152_reg { #define AXP_GPIO_CTRL_INPUT 0x02 /* Input */ #define AXP_GPIO_STATE 0x97 #define AXP_GPIO_STATE_OFFSET 0 +#endif |