colibri_imx6: fix video stdout in default environment

[oweals/u-boot.git] / include / axp221.h

diff --git a/include/axp221.h b/include/axp221.h
index 04cd8c2be48b2e516cc3c27fb755626e091d2a4b..caffb910f4b0bb61f169f11b88869f0bee6fd225 100644 (file)
--- a/include/axp221.h
+++ b/include/axp221.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2013 Oliver Schinagl <oliver@schinagl.nl>
  *
  * X-Powers AXP221 Power Management IC driver
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /* Page 0 addresses */
@@ -43,12 +42,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 +52,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 */