diff --git a/lichee/brandy/u-boot-2014.07/arch/arm/cpu/armv7/sun50iw1p1/spl/pmu_spl.c b/lichee/brandy/u-boot-2014.07/arch/arm/cpu/armv7/sun50iw1p1/spl/pmu_spl.c index 2468d7f3d8..9e9a91cb46 100755 --- a/lichee/brandy/u-boot-2014.07/arch/arm/cpu/armv7/sun50iw1p1/spl/pmu_spl.c +++ b/lichee/brandy/u-boot-2014.07/arch/arm/cpu/armv7/sun50iw1p1/spl/pmu_spl.c @@ -53,6 +53,24 @@ int pwrok_restart_enable(void) static int axp_probe(void) { u8 pmu_type; + u8 acin_path; + + /* bpi, set VBUS current limit from 1500mA to 3500mA */ + if(axp_i2c_read(AXP81X_ADDR, BOOT_POWER81X_ACIN_PATH, &acin_path)) + { + printf("axp read error\n"); + return -1; + } + + printf("[BPI] set ac cur limit to 3500mA\n"); + + acin_path &= 0xf8; + acin_path |= 0x04; + if(axp_i2c_write(AXP81X_ADDR, BOOT_POWER81X_ACIN_PATH, acin_path)) + { + printf("axp write error\n"); + return -1; + } if(axp_i2c_read(AXP81X_ADDR, 0x3, &pmu_type)) { diff --git a/lichee/brandy/u-boot-2014.07/board/sunxi/common/secondary_main.c b/lichee/brandy/u-boot-2014.07/board/sunxi/common/secondary_main.c index a6965c1833..50988509ef 100644 --- a/lichee/brandy/u-boot-2014.07/board/sunxi/common/secondary_main.c +++ b/lichee/brandy/u-boot-2014.07/board/sunxi/common/secondary_main.c @@ -225,7 +225,7 @@ static int sunxi_probe_power_state(void) if (pmu_bat_unused || (__bat_exist <= 0)) { - pr_notice("no battery exist\n"); + printf("no battery exist, boot normal\n"); return SUNXI_STATE_NORMAL_BOOT; } diff --git a/lichee/brandy/u-boot-2014.07/include/power/sunxi/axp81X_reg.h b/lichee/brandy/u-boot-2014.07/include/power/sunxi/axp81X_reg.h index 7c2a8e7cdb..5c70285810 100644 --- a/lichee/brandy/u-boot-2014.07/include/power/sunxi/axp81X_reg.h +++ b/lichee/brandy/u-boot-2014.07/include/power/sunxi/axp81X_reg.h @@ -75,6 +75,7 @@ #define BOOT_POWER81X_CHARGE1 (0x33) #define BOOT_POWER81X_CHARGE2 (0x34) #define BOOT_POWER81X_CHARGE3 (0x35) +#define BOOT_POWER81X_ACIN_PATH (0x3A) #define BOOT_POWER81X_BAT_AVERVOL_H8 (0x50)//---------- #define BOOT_POWER81X_BAT_AVERVOL_L4 (0x51)//----------- diff --git a/lichee/tools/pack/chips/sun50iw1p1/bin/boot0_nand_sun50iw1p1.bin b/lichee/tools/pack/chips/sun50iw1p1/bin/boot0_nand_sun50iw1p1.bin index f91d5b75b6..f4ee7df4e0 100755 Binary files a/lichee/tools/pack/chips/sun50iw1p1/bin/boot0_nand_sun50iw1p1.bin and b/lichee/tools/pack/chips/sun50iw1p1/bin/boot0_nand_sun50iw1p1.bin differ diff --git a/lichee/tools/pack/chips/sun50iw1p1/bin/boot0_sdcard_sun50iw1p1.bin b/lichee/tools/pack/chips/sun50iw1p1/bin/boot0_sdcard_sun50iw1p1.bin index c780fbed86..9c54d20923 100755 Binary files a/lichee/tools/pack/chips/sun50iw1p1/bin/boot0_sdcard_sun50iw1p1.bin and b/lichee/tools/pack/chips/sun50iw1p1/bin/boot0_sdcard_sun50iw1p1.bin differ diff --git a/lichee/tools/pack/chips/sun50iw1p1/bin/fes1_sun50iw1p1.bin b/lichee/tools/pack/chips/sun50iw1p1/bin/fes1_sun50iw1p1.bin index 805238cb9d..5e8d9a0519 100644 Binary files a/lichee/tools/pack/chips/sun50iw1p1/bin/fes1_sun50iw1p1.bin and b/lichee/tools/pack/chips/sun50iw1p1/bin/fes1_sun50iw1p1.bin differ diff --git a/lichee/tools/pack/chips/sun50iw1p1/bin/sboot_sun50iw1p1.bin b/lichee/tools/pack/chips/sun50iw1p1/bin/sboot_sun50iw1p1.bin index 5cbfb03c62..0522370114 100755 Binary files a/lichee/tools/pack/chips/sun50iw1p1/bin/sboot_sun50iw1p1.bin and b/lichee/tools/pack/chips/sun50iw1p1/bin/sboot_sun50iw1p1.bin differ diff --git a/lichee/tools/pack/chips/sun50iw1p1/bin/u-boot-sun50iw1p1.bin b/lichee/tools/pack/chips/sun50iw1p1/bin/u-boot-sun50iw1p1.bin index c84b689aa4..4c34ce9720 100755 Binary files a/lichee/tools/pack/chips/sun50iw1p1/bin/u-boot-sun50iw1p1.bin and b/lichee/tools/pack/chips/sun50iw1p1/bin/u-boot-sun50iw1p1.bin differ