Merge branch 'master' of git://git.denx.de/u-boot-sunxi

9 years ago · 3f54dc48c0
parent f2137c2a7f 99deda1dff
commit 3f54dc48c0
2 changed files with 2 additions and 1 deletions
--- 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
--- 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);
 }