diff options
| -rw-r--r-- | arch/arm/configs/sdm660-perf_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/sdm660_defconfig | 2 | ||||
| -rw-r--r-- | drivers/power/supply/qcom/qpnp-fg-gen3.c | 13 | ||||
| -rw-r--r-- | drivers/power/supply/qcom/qpnp-qnovo.c | 4 |
4 files changed, 14 insertions, 7 deletions
diff --git a/arch/arm/configs/sdm660-perf_defconfig b/arch/arm/configs/sdm660-perf_defconfig index dcf4f6fa0031..013bada10783 100644 --- a/arch/arm/configs/sdm660-perf_defconfig +++ b/arch/arm/configs/sdm660-perf_defconfig @@ -327,12 +327,14 @@ CONFIG_POWER_RESET=y CONFIG_POWER_RESET_QCOM=y CONFIG_QCOM_DLOAD_MODE=y CONFIG_POWER_RESET_SYSCON=y +CONFIG_QPNP_FG_GEN3=y CONFIG_SMB1351_USB_CHARGER=y CONFIG_MSM_BCL_CTL=y CONFIG_MSM_BCL_PERIPHERAL_CTL=y CONFIG_BATTERY_BCL=y CONFIG_QPNP_SMB2=y CONFIG_SMB138X_CHARGER=y +CONFIG_QPNP_QNOVO=y CONFIG_APSS_CORE_EA=y CONFIG_MSM_APM=y CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y diff --git a/arch/arm/configs/sdm660_defconfig b/arch/arm/configs/sdm660_defconfig index 8983a7b35e00..22da2099accc 100644 --- a/arch/arm/configs/sdm660_defconfig +++ b/arch/arm/configs/sdm660_defconfig @@ -324,12 +324,14 @@ CONFIG_POWER_RESET=y CONFIG_POWER_RESET_QCOM=y CONFIG_QCOM_DLOAD_MODE=y CONFIG_POWER_RESET_SYSCON=y +CONFIG_QPNP_FG_GEN3=y CONFIG_SMB1351_USB_CHARGER=y CONFIG_MSM_BCL_CTL=y CONFIG_MSM_BCL_PERIPHERAL_CTL=y CONFIG_BATTERY_BCL=y CONFIG_QPNP_SMB2=y CONFIG_SMB138X_CHARGER=y +CONFIG_QPNP_QNOVO=y CONFIG_APSS_CORE_EA=y CONFIG_MSM_APM=y CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y diff --git a/drivers/power/supply/qcom/qpnp-fg-gen3.c b/drivers/power/supply/qcom/qpnp-fg-gen3.c index 1015ab73ac11..fdb458efd560 100644 --- a/drivers/power/supply/qcom/qpnp-fg-gen3.c +++ b/drivers/power/supply/qcom/qpnp-fg-gen3.c @@ -2316,7 +2316,8 @@ static void sram_dump_work(struct work_struct *work) sram_dump_work.work); u8 buf[FG_SRAM_LEN]; int rc; - s64 timestamp_ms; + s64 timestamp_ms, quotient; + s32 remainder; rc = fg_sram_read(chip, 0, 0, buf, FG_SRAM_LEN, FG_IMA_DEFAULT); if (rc < 0) { @@ -2325,12 +2326,14 @@ static void sram_dump_work(struct work_struct *work) } timestamp_ms = ktime_to_ms(ktime_get_boottime()); - fg_dbg(chip, FG_STATUS, "SRAM Dump Started at %lld.%lld\n", - timestamp_ms / 1000, timestamp_ms % 1000); + quotient = div_s64_rem(timestamp_ms, 1000, &remainder); + fg_dbg(chip, FG_STATUS, "SRAM Dump Started at %lld.%d\n", + quotient, remainder); dump_sram(buf, 0, FG_SRAM_LEN); timestamp_ms = ktime_to_ms(ktime_get_boottime()); - fg_dbg(chip, FG_STATUS, "SRAM Dump done at %lld.%lld\n", - timestamp_ms / 1000, timestamp_ms % 1000); + quotient = div_s64_rem(timestamp_ms, 1000, &remainder); + fg_dbg(chip, FG_STATUS, "SRAM Dump done at %lld.%d\n", + quotient, remainder); resched: schedule_delayed_work(&chip->sram_dump_work, msecs_to_jiffies(fg_sram_dump_period_ms)); diff --git a/drivers/power/supply/qcom/qpnp-qnovo.c b/drivers/power/supply/qcom/qpnp-qnovo.c index 078bbaaad5a2..8ae9e842bef2 100644 --- a/drivers/power/supply/qcom/qpnp-qnovo.c +++ b/drivers/power/supply/qcom/qpnp-qnovo.c @@ -817,7 +817,7 @@ static ssize_t current_show(struct class *c, struct class_attribute *attr, } comp_val_nA = div_s64(regval_nA * gain, 1000000) + offset_nA; - comp_val_uA = comp_val_nA / 1000; + comp_val_uA = div_s64(comp_val_nA, 1000); return snprintf(ubuf, PAGE_SIZE, "%d%s\n", comp_val_uA, params[i].units_str); @@ -848,7 +848,7 @@ static ssize_t voltage_show(struct class *c, struct class_attribute *attr, gain = chip->v_gain_mega; comp_val_nV = div_s64(regval_nV * gain, 1000000) + offset_nV; - comp_val_uV = comp_val_nV / 1000; + comp_val_uV = div_s64(comp_val_nV, 1000); return snprintf(ubuf, PAGE_SIZE, "%d%s\n", comp_val_uV, params[i].units_str); |