Merge git://git.denx.de/u-boot-dm

This commit is contained in:
Tom Rini
2017-12-14 15:46:07 -05:00
61 changed files with 1638 additions and 62 deletions

View File

@ -27,6 +27,7 @@ DECLARE_GLOBAL_DATA_PTR;
enum {
BUCK1,
BUCK2,
BUCK3,
LDO1,
LDO2,
OUTPUT_COUNT,
@ -42,6 +43,7 @@ static const char *regulator_names[OUTPUT_COUNT][OUTPUT_NAME_COUNT] = {
/* devname, platname */
{ SANDBOX_BUCK1_DEVNAME, SANDBOX_BUCK1_PLATNAME },
{ SANDBOX_BUCK2_DEVNAME, SANDBOX_BUCK2_PLATNAME },
{ SANDBOX_BUCK3_DEVNAME, SANDBOX_BUCK3_PLATNAME },
{ SANDBOX_LDO1_DEVNAME, SANDBOX_LDO1_PLATNAME},
{ SANDBOX_LDO2_DEVNAME, SANDBOX_LDO2_PLATNAME},
};