diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-07-11 07:58:33 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-07-11 07:58:33 +0200 |
| commit | e2da792a523bf4366943545217fee574219b263f (patch) | |
| tree | 9a1dead130235b81d200d9b7f896fa1c0ff00e23 /include | |
| parent | 1f3959944ec390309535aeb47488da9881d2772d (diff) | |
| parent | 4f0abb8db08b4970e9d58d79947638f8e298fcf6 (diff) | |
| download | barebox-e2da792a523bf4366943545217fee574219b263f.tar.gz barebox-e2da792a523bf4366943545217fee574219b263f.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'include')
| -rw-r--r-- | include/mfd/mc13892.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/include/mfd/mc13892.h b/include/mfd/mc13892.h index 22df5f0676..c92a462445 100644 --- a/include/mfd/mc13892.h +++ b/include/mfd/mc13892.h @@ -95,22 +95,22 @@ #define MC13892_SETTING_1_VSD_3_0 (6 << 6) #define MC13892_SETTING_1_VSD_3_15 (7 << 6) #define MC13892_SETTING_1_VSD_MASK (7 << 6) -#define MC13892_SETTING_1_VGEN1_1_2 0 -#define MC13892_SETTING_1_VGEN1_1_5 1 -#define MC13892_SETTING_1_VGEN1_2_775 2 -#define MC13892_SETTING_1_VGEN1_3_15 3 -#define MC13892_SETTING_1_VGEN1_MASK 3 -#define MC13892_SETTING_1_VGEN2_1_2 (0 << 6) -#define MC13892_SETTING_1_VGEN2_1_5 (1 << 6) -#define MC13892_SETTING_1_VGEN2_1_6 (2 << 6) -#define MC13892_SETTING_1_VGEN2_1_8 (3 << 6) -#define MC13892_SETTING_1_VGEN2_2_7 (4 << 6) -#define MC13892_SETTING_1_VGEN2_2_8 (5 << 6) -#define MC13892_SETTING_1_VGEN2_3_0 (6 << 6) -#define MC13892_SETTING_1_VGEN2_3_15 (7 << 6) -#define MC13892_SETTING_1_VGEN2_MASK (7 << 6) /* Fields in REG_SETTING_0 */ +#define MC13892_SETTING_0_VGEN1_1_2 (0 << 0) +#define MC13892_SETTING_0_VGEN1_1_5 (1 << 0) +#define MC13892_SETTING_0_VGEN1_2_775 (2 << 0) +#define MC13892_SETTING_0_VGEN1_3_15 (3 << 0) +#define MC13892_SETTING_0_VGEN1_MASK (3 << 0) +#define MC13892_SETTING_0_VGEN2_1_2 (0 << 6) +#define MC13892_SETTING_0_VGEN2_1_5 (1 << 6) +#define MC13892_SETTING_0_VGEN2_1_6 (2 << 6) +#define MC13892_SETTING_0_VGEN2_1_8 (3 << 6) +#define MC13892_SETTING_0_VGEN2_2_7 (4 << 6) +#define MC13892_SETTING_0_VGEN2_2_8 (5 << 6) +#define MC13892_SETTING_0_VGEN2_3_0 (6 << 6) +#define MC13892_SETTING_0_VGEN2_3_15 (7 << 6) +#define MC13892_SETTING_0_VGEN2_MASK (7 << 6) #define MC13892_SETTING_0_VGEN3_1_8 (0 << 14) #define MC13892_SETTING_0_VGEN3_2_9 (1 << 14) #define MC13892_SETTING_0_VGEN3_MASK (1 << 14) |