diff options
| author | Tom Rini <trini@konsulko.com> | 2017-06-10 09:47:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-10 09:47:57 -0400 |
| commit | 75fd49c836d9a1750c9b6d86c0511b990fbe9fa8 (patch) | |
| tree | cb0e9010edb4dbc48230bf6fc031de9a101d42dd /include | |
| parent | 56491f98d48921a57d1f13e3f91556a1b87de2f8 (diff) | |
| parent | abf54bf978ed9932d69ee7f937012398d0d8d08f (diff) | |
| download | u-boot-75fd49c836d9a1750c9b6d86c0511b990fbe9fa8.tar.gz u-boot-75fd49c836d9a1750c9b6d86c0511b990fbe9fa8.tar.xz u-boot-75fd49c836d9a1750c9b6d86c0511b990fbe9fa8.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Diffstat (limited to 'include')
| -rw-r--r-- | include/blk.h | 7 | ||||
| -rw-r--r-- | include/power/lp87565.h | 12 | ||||
| -rw-r--r-- | include/power/tps65217.h | 1 | ||||
| -rw-r--r-- | include/power/tps65218.h | 1 |
4 files changed, 21 insertions, 0 deletions
diff --git a/include/blk.h b/include/blk.h index a128ee4841..4d60987f61 100644 --- a/include/blk.h +++ b/include/blk.h @@ -616,4 +616,11 @@ ulong blk_write_devnum(enum if_type if_type, int devnum, lbaint_t start, */ int blk_select_hwpart_devnum(enum if_type if_type, int devnum, int hwpart); +/** + * blk_get_from_parent() - obtain a block device by looking up its parent + * + * All devices with + */ +int blk_get_from_parent(struct udevice *parent, struct udevice **devp); + #endif diff --git a/include/power/lp87565.h b/include/power/lp87565.h new file mode 100644 index 0000000000..5160f5df6c --- /dev/null +++ b/include/power/lp87565.h @@ -0,0 +1,12 @@ +#define LP87565 0x0 +#define LP87565_Q1 0x1 + +#define LP87565_BUCK_NUM 6 + +/* Drivers name */ +#define LP87565_BUCK_DRIVER "lp87565_buck" + +#define LP87565_BUCK_VOLT_MASK 0xFF +#define LP87565_BUCK_VOLT_MAX_HEX 0xFF +#define LP87565_BUCK_VOLT_MAX 3360000 +#define LP87565_BUCK_MODE_MASK 0x80 diff --git a/include/power/tps65217.h b/include/power/tps65217.h index 69a49f76fe..cb07ea5ce6 100644 --- a/include/power/tps65217.h +++ b/include/power/tps65217.h @@ -38,6 +38,7 @@ enum { TPS65217_DEFLS1, TPS65217_DEFLS2, TPS65217_ENABLE, + TPS65217_RESERVED0, /* no 0x17 register available */ TPS65217_DEFUVLO, TPS65217_SEQ1, TPS65217_SEQ2, diff --git a/include/power/tps65218.h b/include/power/tps65218.h index e3538e21f0..43b9c9aa52 100644 --- a/include/power/tps65218.h +++ b/include/power/tps65218.h @@ -63,6 +63,7 @@ enum { #define TPS65218_DCDC_VOLT_SEL_1200MV 0x23 #define TPS65218_DCDC_VOLT_SEL_1260MV 0x29 #define TPS65218_DCDC_VOLT_SEL_1330MV 0x30 +#define TPS65218_DCDC3_VOLT_SEL_1350MV 0x12 #define TPS65218_CC_STAT (BIT(0) | BIT(1)) #define TPS65218_STATE (BIT(2) | BIT(3)) |