mirror of
https://github.com/LuckfoxTECH/luckfox-pico.git
synced 2026-01-19 09:52:31 +01:00
project:build.sh: Added fastboot support; custom modifications to U-Boot and kernel implemented using patches.
project:cfg:BoardConfig_IPC: Added fastboot BoardConfig file and firmware post-scripts, distinguishing between the BoardConfigs for Luckfox Pico Pro and Luckfox Pico Max. project:app: Added fastboot_client and rk_smart_door for quick boot applications; updated rkipc app to adapt to the latest media library. media:samples: Added more usage examples. media:rockit: Fixed bugs; removed support for retrieving data frames from VPSS. media:isp: Updated rkaiq library and related tools to support connection to RKISP_Tuner. sysdrv:Makefile: Added support for compiling drv_ko on Luckfox Pico Ultra W using Ubuntu; added support for custom root filesystem. sysdrv:tools:board: Updated Buildroot optional mirror sources, updated some software versions, and stored device tree files and configuration files that undergo multiple modifications for U-Boot and kernel separately. sysdrv:source:mcu: Used RISC-V MCU SDK with RT-Thread system, mainly for initializing camera AE during quick boot. sysdrv:source:uboot: Added support for fastboot; added high baud rate DDR bin for serial firmware upgrades. sysdrv:source:kernel: Upgraded to version 5.10.160; increased NPU frequency for RV1106G3; added support for fastboot. Signed-off-by: luckfox-eng29 <eng29@luckfox.com>
This commit is contained in:
@@ -427,11 +427,11 @@ static int adp5061_get_chg_type(struct adp5061_state *st,
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
chg_type = adp5061_chg_type[ADP5061_CHG_STATUS_1_CHG_STATUS(status1)];
|
||||
if (chg_type > ADP5061_CHG_FAST_CV)
|
||||
chg_type = ADP5061_CHG_STATUS_1_CHG_STATUS(status1);
|
||||
if (chg_type >= ARRAY_SIZE(adp5061_chg_type))
|
||||
val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
|
||||
else
|
||||
val->intval = chg_type;
|
||||
val->intval = adp5061_chg_type[chg_type];
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -185,7 +185,6 @@ static int axp20x_battery_get_prop(struct power_supply *psy,
|
||||
union power_supply_propval *val)
|
||||
{
|
||||
struct axp20x_batt_ps *axp20x_batt = power_supply_get_drvdata(psy);
|
||||
struct iio_channel *chan;
|
||||
int ret = 0, reg, val1;
|
||||
|
||||
switch (psp) {
|
||||
@@ -265,12 +264,12 @@ static int axp20x_battery_get_prop(struct power_supply *psy,
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
if (reg & AXP20X_PWR_STATUS_BAT_CHARGING)
|
||||
chan = axp20x_batt->batt_chrg_i;
|
||||
else
|
||||
chan = axp20x_batt->batt_dischrg_i;
|
||||
|
||||
ret = iio_read_channel_processed(chan, &val->intval);
|
||||
if (reg & AXP20X_PWR_STATUS_BAT_CHARGING) {
|
||||
ret = iio_read_channel_processed(axp20x_batt->batt_chrg_i, &val->intval);
|
||||
} else {
|
||||
ret = iio_read_channel_processed(axp20x_batt->batt_dischrg_i, &val1);
|
||||
val->intval = -val1;
|
||||
}
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
||||
@@ -41,11 +41,11 @@
|
||||
#define VBUS_ISPOUT_CUR_LIM_1500MA 0x1 /* 1500mA */
|
||||
#define VBUS_ISPOUT_CUR_LIM_2000MA 0x2 /* 2000mA */
|
||||
#define VBUS_ISPOUT_CUR_NO_LIM 0x3 /* 2500mA */
|
||||
#define VBUS_ISPOUT_VHOLD_SET_MASK 0x31
|
||||
#define VBUS_ISPOUT_VHOLD_SET_MASK 0x38
|
||||
#define VBUS_ISPOUT_VHOLD_SET_BIT_POS 0x3
|
||||
#define VBUS_ISPOUT_VHOLD_SET_OFFSET 4000 /* 4000mV */
|
||||
#define VBUS_ISPOUT_VHOLD_SET_LSB_RES 100 /* 100mV */
|
||||
#define VBUS_ISPOUT_VHOLD_SET_4300MV 0x3 /* 4300mV */
|
||||
#define VBUS_ISPOUT_VHOLD_SET_4400MV 0x4 /* 4400mV */
|
||||
#define VBUS_ISPOUT_VBUS_PATH_DIS BIT(7)
|
||||
|
||||
#define CHRG_CCCV_CC_MASK 0xf /* 4 bits */
|
||||
@@ -744,6 +744,16 @@ static int charger_init_hw_regs(struct axp288_chrg_info *info)
|
||||
ret = axp288_charger_vbus_path_select(info, true);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
} else {
|
||||
/* Set Vhold to the factory default / recommended 4.4V */
|
||||
val = VBUS_ISPOUT_VHOLD_SET_4400MV << VBUS_ISPOUT_VHOLD_SET_BIT_POS;
|
||||
ret = regmap_update_bits(info->regmap, AXP20X_VBUS_IPSOUT_MGMT,
|
||||
VBUS_ISPOUT_VHOLD_SET_MASK, val);
|
||||
if (ret < 0) {
|
||||
dev_err(&info->pdev->dev, "register(%x) write error(%d)\n",
|
||||
AXP20X_VBUS_IPSOUT_MGMT, ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
/* Read current charge voltage and current limit */
|
||||
|
||||
Reference in New Issue
Block a user