diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-11-14 12:35:49 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-11-14 12:35:49 +0100 |
| commit | f772aa92c2c04d73c8dfc7f313af0877808ae16a (patch) | |
| tree | f7317e76d1326f0d0cde019cf49fe243888f9f05 /include | |
| parent | 7e33e8c076e7681b09b70641ab6783098ff99e69 (diff) | |
| parent | ee69c588417972185a1a2d72aa553410493791c2 (diff) | |
| download | barebox-f772aa92c2c04d73c8dfc7f313af0877808ae16a.tar.gz barebox-f772aa92c2c04d73c8dfc7f313af0877808ae16a.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'include')
| -rw-r--r-- | include/command.h | 2 | ||||
| -rw-r--r-- | include/globalvar.h | 2 | ||||
| -rw-r--r-- | include/linux/clk.h | 4 | ||||
| -rw-r--r-- | include/linux/list.h | 1 | ||||
| -rw-r--r-- | include/mfd/mc13892.h | 40 |
5 files changed, 38 insertions, 11 deletions
diff --git a/include/command.h b/include/command.h index 2e7278099b..43ee454f22 100644 --- a/include/command.h +++ b/include/command.h @@ -89,8 +89,6 @@ int run_command(const char *cmd); #endif /* __ASSEMBLY__ */ -#define Struct_Section __attribute__ ((unused,section (".barebox_cmd"))) - #define BAREBOX_CMD_START(_name) \ extern const struct command __barebox_cmd_##_name; \ const struct command __barebox_cmd_##_name \ diff --git a/include/globalvar.h b/include/globalvar.h index 2a5d8a1a1a..ecd9f1d186 100644 --- a/include/globalvar.h +++ b/include/globalvar.h @@ -4,6 +4,7 @@ #include <param.h> #include <driver.h> #include <linux/err.h> +#include <stringlist.h> extern struct device_d global_device; @@ -123,5 +124,6 @@ static inline void dev_param_init_from_nv(struct device_d *dev, const char *name void nv_var_set_clean(void); int nvvar_save(void); +int nv_global_complete(struct string_list *sl, char *instr); #endif /* __GLOBALVAR_H */ diff --git a/include/linux/clk.h b/include/linux/clk.h index 7a0ee110e4..8cb9731f12 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h @@ -362,4 +362,8 @@ static inline int of_clk_init(struct device_node *root, } #endif +struct string_list; + +int clk_name_complete(struct string_list *sl, char *instr); + #endif diff --git a/include/linux/list.h b/include/linux/list.h index bc63ece95d..af5edc9a76 100644 --- a/include/linux/list.h +++ b/include/linux/list.h @@ -2,6 +2,7 @@ #define _LINUX_LIST_H #include <linux/stddef.h> /* for NULL */ +#include <linux/kernel.h> /* * Simple doubly linked list implementation. diff --git a/include/mfd/mc13892.h b/include/mfd/mc13892.h index c92a462445..8b522391b0 100644 --- a/include/mfd/mc13892.h +++ b/include/mfd/mc13892.h @@ -29,21 +29,43 @@ /* REG_CHARGE */ -#define MC13782_CHARGE_VCHRG0 (1 << 0) -#define MC13782_CHARGE_VCHRG1 (1 << 1) -#define MC13782_CHARGE_VCHRG2 (1 << 2) -#define MC13782_CHARGE_ICHRG0 (1 << 3) -#define MC13782_CHARGE_ICHRG1 (1 << 4) -#define MC13782_CHARGE_ICHRG2 (1 << 5) -#define MC13782_CHARGE_ICHRG3 (1 << 6) +#define MC13782_CHARGE_VCHRG_3800 (0 << 0) +#define MC13782_CHARGE_VCHRG_4100 (1 << 0) +#define MC13782_CHARGE_VCHRG_4150 (2 << 0) +#define MC13782_CHARGE_VCHRG_4200 (3 << 0) +#define MC13782_CHARGE_VCHRG_4250 (4 << 0) +#define MC13782_CHARGE_VCHRG_4300 (5 << 0) +#define MC13782_CHARGE_VCHRG_4375 (6 << 0) +#define MC13782_CHARGE_VCHRG_4450 (7 << 0) +#define MC13782_CHARGE_VCHRG_MASK (7 << 0) +#define MC13782_CHARGE_ICHRG_0 (0 << 3) +#define MC13782_CHARGE_ICHRG_80 (1 << 3) +#define MC13782_CHARGE_ICHRG_240 (2 << 3) +#define MC13782_CHARGE_ICHRG_320 (3 << 3) +#define MC13782_CHARGE_ICHRG_400 (4 << 3) +#define MC13782_CHARGE_ICHRG_480 (5 << 3) +#define MC13782_CHARGE_ICHRG_560 (6 << 3) +#define MC13782_CHARGE_ICHRG_640 (7 << 3) +#define MC13782_CHARGE_ICHRG_720 (8 << 3) +#define MC13782_CHARGE_ICHRG_800 (9 << 3) +#define MC13782_CHARGE_ICHRG_880 (10 << 3) +#define MC13782_CHARGE_ICHRG_960 (11 << 3) +#define MC13782_CHARGE_ICHRG_1040 (12 << 3) +#define MC13782_CHARGE_ICHRG_1200 (13 << 3) +#define MC13782_CHARGE_ICHRG_1600 (14 << 3) +#define MC13782_CHARGE_ICHRG_FULL (15 << 3) +#define MC13782_CHARGE_ICHRG_MASK (15 << 3) #define MC13782_CHARGE_TREN (1 << 7) #define MC13782_CHARGE_ACKLPB (1 << 8) #define MC13782_CHARGE_THCHKB (1 << 9) #define MC13782_CHARGE_FETOVRD (1 << 10) #define MC13782_CHARGE_FETCTRL (1 << 11) #define MC13782_CHARGE_RVRSMODE (1 << 13) -#define MC13782_CHARGE_PLIM0 (1 << 15) -#define MC13782_CHARGE_PLIM1 (1 << 16) +#define MC13782_CHARGE_PLIM_600 (0 << 15) +#define MC13782_CHARGE_PLIM_800 (1 << 15) +#define MC13782_CHARGE_PLIM_1000 (2 << 15) +#define MC13782_CHARGE_PLIM_1200 (3 << 15) +#define MC13782_CHARGE_PLIM_MASK (3 << 15) #define MC13782_CHARGE_PLIMDIS (1 << 17) #define MC13782_CHARGE_CHRGLEDEN (1 << 18) #define MC13782_CHARGE_CHGTMRRST (1 << 19) |