Merge tag 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm

[platform/kernel/u-boot.git] / include / axp809.h

diff --git a/include/axp809.h b/include/axp809.h
index d27fb97..8082e40 100644 (file)
--- a/include/axp809.h
+++ b/include/axp809.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2016 Chen-Yu Tsai <wens@csie.org>
  *
  * X-Powers AXP809 Power Management IC driver
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #define AXP809_CHIP_ID         0x03
@@ -45,8 +44,10 @@
 #define AXP809_SHUTDOWN_POWEROFF       (1 << 7)
 
 /* For axp_gpio.c */
+#ifdef CONFIG_AXP809_POWER
 #define AXP_POWER_STATUS               0x00
-#define AXP_POWER_STATUS_VBUS_PRESENT          (1 << 5)
+#define AXP_POWER_STATUS_ALDO_IN               BIT(0)
+#define AXP_POWER_STATUS_VBUS_PRESENT          BIT(5)
 #define AXP_VBUS_IPSOUT                        0x30
 #define AXP_VBUS_IPSOUT_DRIVEBUS               (1 << 2)
 #define AXP_MISC_CTRL                  0x8f
@@ -58,3 +59,4 @@
 #define AXP_GPIO_CTRL_INPUT            0x02 /* Input */
 #define AXP_GPIO_STATE                 0x94
 #define AXP_GPIO_STATE_OFFSET          0
+#endif