diff options
| author | Tom Rini <trini@konsulko.com> | 2015-03-26 22:13:52 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-26 22:13:52 -0400 |
| commit | 3f54dc48c0579b934eba5cfaeb19fb6c8ddcb9ec (patch) | |
| tree | 213e283eefc3f67589b0d3f2172c45424158f84c | |
| parent | f2137c2a7f401089918c7768cbdc56444b1c7548 (diff) | |
| parent | 99deda1dff206d679fcc87949b7151df0d47ea73 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
| -rw-r--r-- | configs/Cubietruck_defconfig | 1 | ||||
| -rw-r--r-- | drivers/power/axp209.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index 5c23bc76cd..fa48331fc5 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -1,6 +1,7 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI" CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb" +CONFIG_GMAC_TX_DELAY=1 CONFIG_VIDEO_VGA=y CONFIG_ARM=y CONFIG_ARCH_SUNXI=y diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c index 4565398b0b..f8c9b77be0 100644 --- a/drivers/power/axp209.c +++ b/drivers/power/axp209.c @@ -119,7 +119,7 @@ int axp209_set_ldo3(int mvolt) if (mvolt == -1) cfg = 0x80; /* determined by LDO3IN pin */ else - cfg = axp209_mvolt_to_cfg(mvolt, 700, 2275, 25); + cfg = axp209_mvolt_to_cfg(mvolt, 700, 3500, 25); return axp209_write(AXP209_LDO3_VOLTAGE, cfg); } |