Minor enhancements to axp173 driver

- Added register names to reduce usage of magic numbers
- Added function to control max charging current, needed for USB
- Corrected comment about axp173, since FiiO M3K has an axp192

Change-Id: I6604ce8d44e5a2ee84061cf042d17ccc4734ac57

1 files changed, 10 insertions, 3 deletions

diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/power-fiiom3k.c b/firmware/target/mips/ingenic_x1000/fiiom3k/power-fiiom3k.c
index b4923835aa..a3760d145a 100644
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/power-fiiom3k.c
+++ b/firmware/target/mips/ingenic_x1000/fiiom3k/power-fiiom3k.c
@@ -68,8 +68,14 @@ void power_init(void)
     axp173_adc_set_enabled(bits);
 
     /* Turn on all power outputs */
-    i2c_reg_modify1(AXP173_BUS, AXP173_ADDR, 0x12, 0, 0x5f, NULL);
-    i2c_reg_modify1(AXP173_BUS, AXP173_ADDR, 0x80, 0, 0xc0, NULL);
+    i2c_reg_modify1(AXP173_BUS, AXP173_ADDR,
+                    AXP173_REG_PWROUTPUTCTRL, 0, 0x5f, NULL);
+    i2c_reg_modify1(AXP173_BUS, AXP173_ADDR,
+                    AXP173_REG_DCDCWORKINGMODE, 0, 0xc0, NULL);
+
+    /* Set the default charging current. This is the same as the
+     * OF's setting, although it's not strictly within the USB spec. */
+    axp173_set_charge_current(780);
 
     /* Short delay to give power outputs time to stabilize */
     mdelay(5);
@@ -82,7 +88,8 @@ void adc_init(void)
 void power_off(void)
 {
     /* Set the shutdown bit */
-    i2c_reg_setbit1(AXP173_BUS, AXP173_ADDR, 0x32, 7, 1, NULL);
+    i2c_reg_setbit1(AXP173_BUS, AXP173_ADDR,
+                    AXP173_REG_SHUTDOWNLEDCTRL, 7, 1, NULL);
     while(1);
 }