Skip to content

Commit 755d21f

Browse files
Merge pull request #34 from EmcraftSystems/RM7440
drivers: sensor: npm1300_charger: Make the battery thermistor optional
2 parents 36ec16b + d5157ea commit 755d21f

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

drivers/sensor/nordic/npm1300_charger/npm1300_charger.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,7 @@ int npm1300_charger_init(const struct device *dev)
456456
{
457457
const struct npm1300_charger_config *const config = dev->config;
458458
uint16_t idx;
459+
uint8_t reg = 0;
459460
int ret;
460461

461462
if (!device_is_ready(config->mfd)) {
@@ -469,7 +470,12 @@ int npm1300_charger_init(const struct device *dev)
469470
return ret;
470471
}
471472

472-
ret = set_ntc_thresholds(config);
473+
if ((config->thermistor_ohms != 0) && (config->thermistor_beta != 0)) {
474+
ret = set_ntc_thresholds(config);
475+
} else {
476+
reg = 2U;
477+
ret = mfd_npm1300_reg_write(config->mfd, CHGR_BASE, CHGR_OFFSET_DIS_SET, reg);
478+
}
473479
if (ret != 0) {
474480
return ret;
475481
}
@@ -590,7 +596,8 @@ int npm1300_charger_init(const struct device *dev)
590596

591597
/* Disable automatic recharging if configured */
592598
if (config->disable_recharge) {
593-
ret = mfd_npm1300_reg_write(config->mfd, CHGR_BASE, CHGR_OFFSET_DIS_SET, 1U);
599+
reg |= 1U;
600+
ret = mfd_npm1300_reg_write(config->mfd, CHGR_BASE, CHGR_OFFSET_DIS_SET, reg);
594601
if (ret != 0) {
595602
return ret;
596603
}

dts/bindings/sensor/nordic,npm1300-charger.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,17 @@ properties:
5050
5151
thermistor-ohms:
5252
type: int
53-
required: true
53+
default: 0
5454
enum:
55+
- 0
5556
- 10000
5657
- 47000
5758
- 100000
5859
description: Thermistor nominal resistance type in ohms.
5960

6061
thermistor-beta:
6162
type: int
62-
required: true
63+
default: 0
6364
description: Beta value of selected thermistor.
6465

6566
thermistor-cold-millidegrees:

0 commit comments

Comments
 (0)