summaryrefslogtreecommitdiffstats
path: root/firmware/target/mips/ingenic_x1000/erosqnative/power-erosqnative.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/mips/ingenic_x1000/erosqnative/power-erosqnative.c')
-rw-r--r--firmware/target/mips/ingenic_x1000/erosqnative/power-erosqnative.c82
1 files changed, 27 insertions, 55 deletions
diff --git a/firmware/target/mips/ingenic_x1000/erosqnative/power-erosqnative.c b/firmware/target/mips/ingenic_x1000/erosqnative/power-erosqnative.c
index 9cf64cee01..a1a4d2c2b2 100644
--- a/firmware/target/mips/ingenic_x1000/erosqnative/power-erosqnative.c
+++ b/firmware/target/mips/ingenic_x1000/erosqnative/power-erosqnative.c
@@ -28,7 +28,7 @@
#ifdef HAVE_USB_CHARGING_ENABLE
# include "usb_core.h"
#endif
-#include "axp192.h"
+#include "axp-pmu.h"
#include "i2c-x1000.h"
const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
@@ -56,35 +56,27 @@ const unsigned short percent_to_volt_charge[11] =
void power_init(void)
{
- /* Configure I2C bus */
- i2c_x1000_set_freq(AXP_PMU_BUS, I2C_FREQ_400K);
-
- /* FIXME: Copy paste from M3K. Probably not necessary */
- axp_modify(AXP_REG_DCDCMODE, 0, 0xc0);
-
- /* Power on required supplies
- * TODO: This should be checked, though likely all but EXTEN are needed */
- axp_set_enabled_supplies(
- (1 << AXP_SUPPLY_EXTEN) |
- (1 << AXP_SUPPLY_DCDC1) |
- (1 << AXP_SUPPLY_DCDC2) |
- (1 << AXP_SUPPLY_DCDC3) |
- (1 << AXP_SUPPLY_LDO2) |
- (1 << AXP_SUPPLY_LDO3));
-
- /* Enable required ADCs */
- axp_set_enabled_adcs(
- (1 << AXP_ADC_BATTERY_VOLTAGE) |
- (1 << AXP_ADC_CHARGE_CURRENT) |
- (1 << AXP_ADC_DISCHARGE_CURRENT) |
- (1 << AXP_ADC_VBUS_VOLTAGE) |
- (1 << AXP_ADC_VBUS_CURRENT) |
- (1 << AXP_ADC_INTERNAL_TEMP) |
- (1 << AXP_ADC_APS_VOLTAGE));
-
- /* Configure USB charging */
- axp_set_vhold_level(4400);
- usb_charging_maxcurrent_change(100);
+ /* Initialize driver */
+ i2c_x1000_set_freq(2, I2C_FREQ_400K);
+ axp_init();
+
+ /* Set lowest sample rate */
+ axp_adc_set_rate(AXP_ADC_RATE_25HZ);
+
+ /* Ensure battery voltage ADC is enabled */
+ int bits = axp_adc_get_enabled();
+ bits |= (1 << ADC_BATTERY_VOLTAGE);
+ axp_adc_set_enabled(bits);
+
+ /* Turn on all power outputs */
+ i2c_reg_modify1(AXP_PMU_BUS, AXP_PMU_ADDR,
+ AXP_REG_PWROUTPUTCTRL2, 0, 0x5f, NULL);
+ i2c_reg_modify1(AXP_PMU_BUS, AXP_PMU_ADDR,
+ AXP_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. */
+ axp_set_charge_current(780);
/* Delay to give power outputs time to stabilize.
* With the power thread delay, this can apparently go as low as 50,
@@ -96,22 +88,7 @@ void power_init(void)
#ifdef HAVE_USB_CHARGING_ENABLE
void usb_charging_maxcurrent_change(int 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_500mA;
- charge_current = 100;
- } else {
- vbus_limit = AXP_VBUS_LIMIT_500mA;
- charge_current = 550;
- }
-
- axp_set_vbus_limit(vbus_limit);
- axp_set_charge_current(charge_current);
+ axp_set_charge_current(maxcurrent);
}
#endif
@@ -127,25 +104,20 @@ void power_off(void)
bool charging_state(void)
{
- return axp_is_charging();
-}
-
-unsigned int power_input_status(void)
-{
- return axp_power_input_status();
+ return axp_battery_status() == AXP_BATT_CHARGING;
}
int _battery_voltage(void)
{
- return axp_read_adc(AXP_ADC_BATTERY_VOLTAGE);
+ return axp_adc_read(ADC_BATTERY_VOLTAGE);
}
#if CONFIG_BATTERY_MEASURE & CURRENT_MEASURE
int _battery_current(void)
{
if(charging_state())
- return axp_read_adc(AXP_ADC_CHARGE_CURRENT);
+ return axp_adc_read(ADC_CHARGE_CURRENT);
else
- return axp_read_adc(AXP_ADC_DISCHARGE_CURRENT);
+ return axp_adc_read(ADC_DISCHARGE_CURRENT);
}
#endif