diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-30 14:07:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-30 14:07:23 -0400 |
| commit | ccbbada0a59fead35495409d0c2c7bcb22a40278 (patch) | |
| tree | 04acadf027384a90ec4fb2ff19f5b4a0849ae6bc /include | |
| parent | 380e86f361e4e2aef83295972863654fde157560 (diff) | |
| parent | de59d10cd0a4e79c85e4f791fb8f023164d0890e (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Diffstat (limited to 'include')
| -rw-r--r-- | include/mmc.h | 2 | ||||
| -rw-r--r-- | include/power/tps65218.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/mmc.h b/include/mmc.h index 8346b0e19e..6a0ea0af21 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -430,7 +430,7 @@ struct mmc { u8 part_support; u8 part_attr; u8 wr_rel_set; - char part_config; + u8 part_config; uint tran_speed; uint read_bl_len; uint write_bl_len; diff --git a/include/power/tps65218.h b/include/power/tps65218.h index 4d68faacaf..e3538e21f0 100644 --- a/include/power/tps65218.h +++ b/include/power/tps65218.h @@ -56,6 +56,8 @@ enum { #define TPS65218_MASK_ALL_BITS 0xFF +#define TPS65218_DCDC_VSEL_MASK 0x3F + #define TPS65218_DCDC_VOLT_SEL_0950MV 0x0a #define TPS65218_DCDC_VOLT_SEL_1100MV 0x19 #define TPS65218_DCDC_VOLT_SEL_1200MV 0x23 |