Skip to content

manifest: sdk-zephyr: [nrf fromtree] nPM1304 drivers #22937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 3, 2025
+42 −86
Merged

manifest: sdk-zephyr: [nrf fromtree] nPM1304 drivers #22937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80a4ce0
npm1300: rename npm1300 to npm13xx
seov-nordic Jun 30, 2025
5842b3e
Revert "scripts: quarantine: quarantine due to npm include issue"
seov-nordic Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions boards/nordic/thingy91x/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ if !IS_BOOTLOADER_IMG
config REGULATOR
default y

# nPM6001 must be initialized after it is powered from nPM1300 (REGULATOR_NPM1300_INIT_PRIORITY)
# nPM6001 must be initialized after it is powered from nPM1300 (REGULATOR_NPM13XX_INIT_PRIORITY)
config MFD_NPM6001_INIT_PRIORITY
default 87
config REGULATOR_NPM6001_INIT_PRIORITY
default 88
config WIFI_INIT_PRIORITY
default 89

# GPIO hogs must be initialized after nPM1300 (GPIO_NPM1300_INIT_PRIORITY)
# GPIO hogs must be initialized after nPM1300 (GPIO_NPM13XX_INIT_PRIORITY)
config GPIO_HOGS_INIT_PRIORITY
default 86

Expand Down
2 changes: 1 addition & 1 deletion boards/nordic/thingy91x/Kconfig.defconfig.nrf9151
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ config I2C
config GPIO_HOGS
default n

config GPIO_NPM1300
config GPIO_NPM13XX
default n

endif # IS_BOOTLOADER_IMG
Expand Down
10 changes: 5 additions & 5 deletions boards/nordic/thingy91x/thingy91x_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include <dt-bindings/regulator/npm1300.h>
#include <dt-bindings/regulator/npm13xx.h>
#include <dt-bindings/regulator/npm6001.h>

&i2c2 {
Expand Down Expand Up @@ -64,14 +64,14 @@
};
/* LDO1 is used as a load switch pulling the nPM6001 enable line to VSYS */
ldsw_nPM6001_en: LDO1 {
regulator-initial-mode = <NPM1300_LDSW_MODE_LDSW>;
regulator-allowed-modes = <NPM1300_LDSW_MODE_LDSW>;
regulator-initial-mode = <NPM13XX_LDSW_MODE_LDSW>;
regulator-allowed-modes = <NPM13XX_LDSW_MODE_LDSW>;
regulator-boot-off;
};
/* LDO2 is used as a load switch for sensor power supply */
ldsw_sensors: LDO2 {
regulator-initial-mode = <NPM1300_LDSW_MODE_LDSW>;
regulator-allowed-modes = <NPM1300_LDSW_MODE_LDSW>;
regulator-initial-mode = <NPM13XX_LDSW_MODE_LDSW>;
regulator-allowed-modes = <NPM13XX_LDSW_MODE_LDSW>;
regulator-boot-on;
};
};
Expand Down
2 changes: 1 addition & 1 deletion samples/pmic/native/npm1300_fuel_gauge/nrf54h20dk_nrf54h20_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include <dt-bindings/regulator/npm1300.h>
#include <dt-bindings/regulator/npm13xx.h>

&i2c130_default {
group1 {
Expand Down
4 changes: 2 additions & 2 deletions samples/pmic/native/npm1300_fuel_gauge/src/fuel_gauge.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <zephyr/kernel.h>
#include <zephyr/device.h>
#include <zephyr/drivers/sensor.h>
#include <zephyr/drivers/sensor/npm1300_charger.h>
#include <zephyr/drivers/sensor/npm13xx_charger.h>
#include <zephyr/sys/printk.h>
#include <zephyr/sys/util.h>

Expand Down Expand Up @@ -46,7 +46,7 @@ static int read_sensors(const struct device *charger, float *voltage, float *cur
sensor_channel_get(charger, SENSOR_CHAN_GAUGE_AVG_CURRENT, &value);
*current = (float)value.val1 + ((float)value.val2 / 1000000);

sensor_channel_get(charger, SENSOR_CHAN_NPM1300_CHARGER_STATUS, &value);
sensor_channel_get(charger, SENSOR_CHAN_NPM13XX_CHARGER_STATUS, &value);
*chg_status = value.val1;

return 0;
Expand Down
12 changes: 6 additions & 6 deletions samples/pmic/native/npm1300_fuel_gauge/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <zephyr/kernel.h>
#include <zephyr/device.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/drivers/mfd/npm1300.h>
#include <zephyr/drivers/mfd/npm13xx.h>
#include <zephyr/drivers/sensor.h>
#include <zephyr/sys/printk.h>

Expand All @@ -22,12 +22,12 @@ static volatile bool vbus_connected;

static void event_callback(const struct device *dev, struct gpio_callback *cb, uint32_t pins)
{
if (pins & BIT(NPM1300_EVENT_VBUS_DETECTED)) {
if (pins & BIT(NPM13XX_EVENT_VBUS_DETECTED)) {
printk("Vbus connected\n");
vbus_connected = true;
}

if (pins & BIT(NPM1300_EVENT_VBUS_REMOVED)) {
if (pins & BIT(NPM13XX_EVENT_VBUS_REMOVED)) {
printk("Vbus removed\n");
vbus_connected = false;
}
Expand Down Expand Up @@ -55,10 +55,10 @@ int main(void)
static struct gpio_callback event_cb;

gpio_init_callback(&event_cb, event_callback,
BIT(NPM1300_EVENT_VBUS_DETECTED) |
BIT(NPM1300_EVENT_VBUS_REMOVED));
BIT(NPM13XX_EVENT_VBUS_DETECTED) |
BIT(NPM13XX_EVENT_VBUS_REMOVED));

err = mfd_npm1300_add_callback(pmic, &event_cb);
err = mfd_npm13xx_add_callback(pmic, &event_cb);
if (err) {
printk("Failed to add pmic callback.\n");
return 0;
Expand Down
4 changes: 2 additions & 2 deletions samples/pmic/native/npm1300_one_button/nrf52840dk_nrf52840.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include <dt-bindings/regulator/npm1300.h>
#include <dt-bindings/regulator/npm13xx.h>

&i2c0_default {
group1 {
Expand All @@ -13,7 +13,7 @@
};

&npm1300_ek_ldo1 {
regulator-initial-mode = <NPM1300_LDSW_MODE_LDSW>;
regulator-initial-mode = <NPM13XX_LDSW_MODE_LDSW>;
};

&npm1300_ek_pmic {
Expand Down
4 changes: 2 additions & 2 deletions samples/pmic/native/npm1300_one_button/nrf52dk_nrf52832.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include <dt-bindings/regulator/npm1300.h>
#include <dt-bindings/regulator/npm13xx.h>

&i2c0_default {
group1 {
Expand All @@ -13,7 +13,7 @@
};

&npm1300_ek_ldo1 {
regulator-initial-mode = <NPM1300_LDSW_MODE_LDSW>;
regulator-initial-mode = <NPM13XX_LDSW_MODE_LDSW>;
};

&npm1300_ek_pmic {
Expand Down
4 changes: 2 additions & 2 deletions samples/pmic/native/npm1300_one_button/nrf5340dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include <dt-bindings/regulator/npm1300.h>
#include <dt-bindings/regulator/npm13xx.h>

&i2c1_default {
group1 {
Expand All @@ -13,7 +13,7 @@
};

&npm1300_ek_ldo1 {
regulator-initial-mode = <NPM1300_LDSW_MODE_LDSW>;
regulator-initial-mode = <NPM13XX_LDSW_MODE_LDSW>;
};

&npm1300_ek_pmic {
Expand Down
4 changes: 2 additions & 2 deletions samples/pmic/native/npm1300_one_button/nrf54h20dk_nrf54h20_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include <dt-bindings/regulator/npm1300.h>
#include <dt-bindings/regulator/npm13xx.h>

&i2c130_default {
group1 {
Expand All @@ -21,7 +21,7 @@
};

&npm1300_ek_ldo1 {
regulator-initial-mode = <NPM1300_LDSW_MODE_LDSW>;
regulator-initial-mode = <NPM13XX_LDSW_MODE_LDSW>;
};

&npm1300_ek_pmic {
Expand Down
4 changes: 2 additions & 2 deletions samples/pmic/native/npm1300_one_button/nrf54l15dk_nrf54l15_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include <dt-bindings/regulator/npm1300.h>
#include <dt-bindings/regulator/npm13xx.h>

&i2c21_default {
group1 {
Expand All @@ -17,7 +17,7 @@
};

&npm1300_ek_ldo1 {
regulator-initial-mode = <NPM1300_LDSW_MODE_LDSW>;
regulator-initial-mode = <NPM13XX_LDSW_MODE_LDSW>;
};

&npm1300_ek_pmic {
Expand Down
4 changes: 2 additions & 2 deletions samples/pmic/native/npm1300_one_button/nrf9160dk_nrf9160.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include <dt-bindings/regulator/npm1300.h>
#include <dt-bindings/regulator/npm13xx.h>

&i2c2_default {
group1 {
Expand All @@ -13,7 +13,7 @@
};

&npm1300_ek_ldo1 {
regulator-initial-mode = <NPM1300_LDSW_MODE_LDSW>;
regulator-initial-mode = <NPM13XX_LDSW_MODE_LDSW>;
};

&npm1300_ek_pmic {
Expand Down
18 changes: 9 additions & 9 deletions samples/pmic/native/npm1300_one_button/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <zephyr/device.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/drivers/led.h>
#include <zephyr/drivers/mfd/npm1300.h>
#include <zephyr/drivers/mfd/npm13xx.h>
#include <zephyr/drivers/regulator.h>
#include <zephyr/drivers/sensor.h>
#include <zephyr/sys/printk.h>
Expand All @@ -32,11 +32,11 @@ static void event_callback(const struct device *dev, struct gpio_callback *cb, u
{
static int press_t;

if (pins & BIT(NPM1300_EVENT_SHIPHOLD_PRESS)) {
if (pins & BIT(NPM13XX_EVENT_SHIPHOLD_PRESS)) {
press_t = k_uptime_get();
}

if (pins & BIT(NPM1300_EVENT_SHIPHOLD_RELEASE)) {
if (pins & BIT(NPM13XX_EVENT_SHIPHOLD_RELEASE)) {
press_t = k_uptime_get() - press_t;

if (press_t < PRESS_SHORT_MS) {
Expand All @@ -61,12 +61,12 @@ static void event_callback(const struct device *dev, struct gpio_callback *cb, u
}
}

if (pins & BIT(NPM1300_EVENT_VBUS_DETECTED)) {
if (pins & BIT(NPM13XX_EVENT_VBUS_DETECTED)) {
printk("Vbus connected\n");
vbus_connected = true;
}

if (pins & BIT(NPM1300_EVENT_VBUS_REMOVED)) {
if (pins & BIT(NPM13XX_EVENT_VBUS_REMOVED)) {
printk("Vbus removed\n");
vbus_connected = false;
}
Expand Down Expand Up @@ -97,11 +97,11 @@ bool configure_events(void)
static struct gpio_callback event_cb;

gpio_init_callback(&event_cb, event_callback,
BIT(NPM1300_EVENT_SHIPHOLD_PRESS) | BIT(NPM1300_EVENT_SHIPHOLD_RELEASE) |
BIT(NPM1300_EVENT_VBUS_DETECTED) |
BIT(NPM1300_EVENT_VBUS_REMOVED));
BIT(NPM13XX_EVENT_SHIPHOLD_PRESS) | BIT(NPM13XX_EVENT_SHIPHOLD_RELEASE) |
BIT(NPM13XX_EVENT_VBUS_DETECTED) |
BIT(NPM13XX_EVENT_VBUS_REMOVED));

mfd_npm1300_add_callback(pmic, &event_cb);
mfd_npm13xx_add_callback(pmic, &event_cb);

/* Initialise vbus detection status */
struct sensor_value val;
Expand Down
2 changes: 1 addition & 1 deletion samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ CONFIG_SPI_NOR=y
CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
CONFIG_SPI_NOR_SFDP_DEVICETREE=y

CONFIG_MFD_NPM1300=n
CONFIG_MFD_NPM13XX=n

CONFIG_BOOT_SERIAL_NO_APPLICATION=y

Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/tags.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,7 @@ ci_samples_pmic:
- zephyr/drivers/i2c/
- zephyr/drivers/mfd/
- zephyr/drivers/regulator/
- zephyr/drivers/sensor/nordic/npm1300_charger/
- zephyr/drivers/sensor/nordic/npm13xx_charger/

ci_samples_ipc:
files:
Expand Down
48 changes: 2 additions & 46 deletions scripts/quarantine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,51 +96,7 @@
comment: "Needs alignment to work with MCUBoot"

- scenarios:
- sample.npm1300_fuel_gauge_compile
- sample.npm1300_one_button_compile
- drivers.counter.basic_api
platforms:
- nrf52840dk/nrf52840
- nrf52dk/nrf52832
- nrf5340dk/nrf5340/cpuapp
- [email protected]/nrf54h20/cpuapp
- nrf54l15dk/nrf54l15/cpuapp
- [email protected]/nrf9160
comment: "https://nordicsemi.atlassian.net/browse/NCSDK-34322"

- scenarios:
- applications.connectivity_bridge
- sample.nrf7002.shell.full_stack_thingy91x
platforms:
- thingy91x/nrf5340/cpuapp
comment: "https://nordicsemi.atlassian.net/browse/NCSDK-34322"

- scenarios:
- applications.serial_lte_modem
- applications.serial_lte_modem.tracing
- sample.cellular.at_client
- sample.cellular.at_client.tracing
- sample.cellular.location
- sample.cellular.modem_shell.thingy91
- sample.cellular.modem_shell.thingy91x_wifi
- sample.cellular.modem_shell_modem_uart_trace
- sample.cellular.nrf_cloud_multi_service.coap
- sample.cellular.nrf_cloud_multi_service.mqtt
- sample.cellular.nrf_cloud_multi_service.mqtt.provisioning.trace
- sample.cellular.nrf_cloud_rest_cell_pos
- sample.cellular.nrf_cloud_rest_device_message
- sample.cellular.nrf_cloud_rest_fota
- sample.cellular.nrf_provisioning
- sample.cellular.udp
- sample.debug.memfault
- sample.debug.memfault.etb
- sample.debug.memfault.modem_trace_to_memfault
- sample.dect.dect_shell
- sample.net.aws_iot
- sample.net.mqtt
- sample.net.mqtt.nrf91.tls
- sample.nrf7002.shell.scan_only_thingy91x
- sample.thingy91x_nrf7000.scan
- sample.thingy91x_nrf7002.radio_test
platforms:
- thingy91x/nrf9151/ns
comment: "https://nordicsemi.atlassian.net/browse/NCSDK-34322"
comment: "https://nordicsemi.atlassian.net/browse/NCSDK-34187"