1 files changed, 20 insertions, 1 deletions

diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/power-fiiom3k.c b/firmware/target/mips/ingenic_x1000/fiiom3k/power-fiiom3k.c
index 53451ffa6c..c8498c4dbc 100644
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/power-fiiom3k.c
+++ b/firmware/target/mips/ingenic_x1000/fiiom3k/power-fiiom3k.c
@@ -78,6 +78,10 @@ void power_init(void)
         (1 << AXP_ADC_INTERNAL_TEMP) |
         (1 << AXP_ADC_APS_VOLTAGE));
 
+    /* Configure USB charging */
+    axp_set_vhold_level(4400);
+    usb_charging_maxcurrent_change(100);
+
     /* Short delay to give power outputs time to stabilize */
     mdelay(200);
 }
@@ -85,7 +89,22 @@ void power_init(void)
 #ifdef HAVE_USB_CHARGING_ENABLE
 void usb_charging_maxcurrent_change(int maxcurrent)
 {
-    axp_set_charge_current(maxcurrent);
+    int vbus_limit;
+    int charge_current;
+
+    /* Note that the charge current setting is a maximum: it will be
+     * reduced dynamically by the AXP192 so the combined load is less
+     * than the set VBUS current limit. */
+    if(maxcurrent <= 100) {
+        vbus_limit = AXP_VBUS_LIMIT_100mA;
+        charge_current = 550;
+    } else {
+        vbus_limit = AXP_VBUS_LIMIT_500mA;
+        charge_current = 550;
+    }
+
+    axp_set_vbus_limit(vbus_limit);
+    axp_set_charge_current(charge_current);
 }
 #endif