Merge branch '2020-05-18-reduce-size-of-common.h'

[oweals/u-boot.git] / include / power / stpmic1.h

diff --git a/include/power/stpmic1.h b/include/power/stpmic1.h
index d90a1a9c93983101ce817e6ef61dda276dfd12ce..d3567df326cfb9a212ac01beb0efd391a97cdef4 100644 (file)
--- a/include/power/stpmic1.h
+++ b/include/power/stpmic1.h
@@ -6,6 +6,7 @@
 #ifndef __PMIC_STPMIC1_H_
 #define __PMIC_STPMIC1_H_
 
+#include <linux/bitops.h>
 #define STPMIC1_MAIN_CR                        0x10
 #define STPMIC1_BUCKS_MRST_CR          0x18
 #define STPMIC1_LDOS_MRST_CR           0x1a
@@ -37,6 +38,7 @@
 #define STPMIC1_BUCK_VOUT(sel)         (sel << STPMIC1_BUCK_VOUT_SHIFT)
 
 #define STPMIC1_BUCK2_1200000V         STPMIC1_BUCK_VOUT(24)
+#define STPMIC1_BUCK2_1250000V         STPMIC1_BUCK_VOUT(26)
 #define STPMIC1_BUCK2_1350000V         STPMIC1_BUCK_VOUT(30)
 
 #define STPMIC1_BUCK3_1800000V         STPMIC1_BUCK_VOUT(39)
@@ -108,11 +110,4 @@ enum {
        STPMIC1_PWR_SW2,
        STPMIC1_MAX_PWR_SW,
 };
-
-int stpmic1_shadow_read_byte(u8 addr, u8 *buf);
-int stpmic1_shadow_write_byte(u8 addr, u8 *buf);
-int stpmic1_nvm_read_byte(u8 addr, u8 *buf);
-int stpmic1_nvm_write_byte(u8 addr, u8 *buf);
-int stpmic1_nvm_read_all(u8 *buf, int buf_len);
-int stpmic1_nvm_write_all(u8 *buf, int buf_len);
 #endif