diff --git a/boards/nordic/thingy91x/Kconfig.defconfig b/boards/nordic/thingy91x/Kconfig.defconfig index e124edb32c9f..06835dc64d10 100644 --- a/boards/nordic/thingy91x/Kconfig.defconfig +++ b/boards/nordic/thingy91x/Kconfig.defconfig @@ -12,7 +12,7 @@ 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 @@ -20,7 +20,7 @@ config REGULATOR_NPM6001_INIT_PRIORITY 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 diff --git a/boards/nordic/thingy91x/Kconfig.defconfig.nrf9151 b/boards/nordic/thingy91x/Kconfig.defconfig.nrf9151 index decfe1da82f8..88db398fc5a9 100644 --- a/boards/nordic/thingy91x/Kconfig.defconfig.nrf9151 +++ b/boards/nordic/thingy91x/Kconfig.defconfig.nrf9151 @@ -101,7 +101,7 @@ config I2C config GPIO_HOGS default n -config GPIO_NPM1300 +config GPIO_NPM13XX default n endif # IS_BOOTLOADER_IMG diff --git a/boards/nordic/thingy91x/thingy91x_common.dtsi b/boards/nordic/thingy91x/thingy91x_common.dtsi index 6303b02975ee..e472b9dee11b 100644 --- a/boards/nordic/thingy91x/thingy91x_common.dtsi +++ b/boards/nordic/thingy91x/thingy91x_common.dtsi @@ -3,7 +3,7 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include +#include #include &i2c2 { @@ -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 = ; - regulator-allowed-modes = ; + regulator-initial-mode = ; + regulator-allowed-modes = ; regulator-boot-off; }; /* LDO2 is used as a load switch for sensor power supply */ ldsw_sensors: LDO2 { - regulator-initial-mode = ; - regulator-allowed-modes = ; + regulator-initial-mode = ; + regulator-allowed-modes = ; regulator-boot-on; }; }; diff --git a/samples/pmic/native/npm1300_fuel_gauge/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/pmic/native/npm1300_fuel_gauge/nrf54h20dk_nrf54h20_cpuapp.overlay index 361db7046d6f..e3a4423d2f48 100644 --- a/samples/pmic/native/npm1300_fuel_gauge/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/samples/pmic/native/npm1300_fuel_gauge/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ - #include + #include &i2c130_default { group1 { diff --git a/samples/pmic/native/npm1300_fuel_gauge/src/fuel_gauge.c b/samples/pmic/native/npm1300_fuel_gauge/src/fuel_gauge.c index 92f10dcf8ff0..200c825b14de 100644 --- a/samples/pmic/native/npm1300_fuel_gauge/src/fuel_gauge.c +++ b/samples/pmic/native/npm1300_fuel_gauge/src/fuel_gauge.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include @@ -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; diff --git a/samples/pmic/native/npm1300_fuel_gauge/src/main.c b/samples/pmic/native/npm1300_fuel_gauge/src/main.c index 2665a0a29156..2735a5323b73 100644 --- a/samples/pmic/native/npm1300_fuel_gauge/src/main.c +++ b/samples/pmic/native/npm1300_fuel_gauge/src/main.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include @@ -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; } @@ -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; diff --git a/samples/pmic/native/npm1300_one_button/nrf52840dk_nrf52840.overlay b/samples/pmic/native/npm1300_one_button/nrf52840dk_nrf52840.overlay index 34f754bfaffb..eba79ef54f4e 100644 --- a/samples/pmic/native/npm1300_one_button/nrf52840dk_nrf52840.overlay +++ b/samples/pmic/native/npm1300_one_button/nrf52840dk_nrf52840.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include +#include &i2c0_default { group1 { @@ -13,7 +13,7 @@ }; &npm1300_ek_ldo1 { - regulator-initial-mode = ; + regulator-initial-mode = ; }; &npm1300_ek_pmic { diff --git a/samples/pmic/native/npm1300_one_button/nrf52dk_nrf52832.overlay b/samples/pmic/native/npm1300_one_button/nrf52dk_nrf52832.overlay index dd8c36fbefa3..d7de14bf4d61 100644 --- a/samples/pmic/native/npm1300_one_button/nrf52dk_nrf52832.overlay +++ b/samples/pmic/native/npm1300_one_button/nrf52dk_nrf52832.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include +#include &i2c0_default { group1 { @@ -13,7 +13,7 @@ }; &npm1300_ek_ldo1 { - regulator-initial-mode = ; + regulator-initial-mode = ; }; &npm1300_ek_pmic { diff --git a/samples/pmic/native/npm1300_one_button/nrf5340dk_nrf5340_cpuapp.overlay b/samples/pmic/native/npm1300_one_button/nrf5340dk_nrf5340_cpuapp.overlay index 9a6fe8510650..8428e9978a76 100644 --- a/samples/pmic/native/npm1300_one_button/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/pmic/native/npm1300_one_button/nrf5340dk_nrf5340_cpuapp.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include +#include &i2c1_default { group1 { @@ -13,7 +13,7 @@ }; &npm1300_ek_ldo1 { - regulator-initial-mode = ; + regulator-initial-mode = ; }; &npm1300_ek_pmic { diff --git a/samples/pmic/native/npm1300_one_button/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/pmic/native/npm1300_one_button/nrf54h20dk_nrf54h20_cpuapp.overlay index d2cf7d77ae59..a32129b2ba14 100644 --- a/samples/pmic/native/npm1300_one_button/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/samples/pmic/native/npm1300_one_button/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ - #include + #include &i2c130_default { group1 { @@ -21,7 +21,7 @@ }; &npm1300_ek_ldo1 { - regulator-initial-mode = ; + regulator-initial-mode = ; }; &npm1300_ek_pmic { diff --git a/samples/pmic/native/npm1300_one_button/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/pmic/native/npm1300_one_button/nrf54l15dk_nrf54l15_cpuapp.overlay index 8f35a2050ae0..007445fbcd24 100644 --- a/samples/pmic/native/npm1300_one_button/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/pmic/native/npm1300_one_button/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include +#include &i2c21_default { group1 { @@ -17,7 +17,7 @@ }; &npm1300_ek_ldo1 { - regulator-initial-mode = ; + regulator-initial-mode = ; }; &npm1300_ek_pmic { diff --git a/samples/pmic/native/npm1300_one_button/nrf9160dk_nrf9160.overlay b/samples/pmic/native/npm1300_one_button/nrf9160dk_nrf9160.overlay index 7357d9d99dde..c40886fa7c25 100644 --- a/samples/pmic/native/npm1300_one_button/nrf9160dk_nrf9160.overlay +++ b/samples/pmic/native/npm1300_one_button/nrf9160dk_nrf9160.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include +#include &i2c2_default { group1 { @@ -13,7 +13,7 @@ }; &npm1300_ek_ldo1 { - regulator-initial-mode = ; + regulator-initial-mode = ; }; &npm1300_ek_pmic { diff --git a/samples/pmic/native/npm1300_one_button/src/main.c b/samples/pmic/native/npm1300_one_button/src/main.c index 6b48c2c1e106..0c6aa493dc77 100644 --- a/samples/pmic/native/npm1300_one_button/src/main.c +++ b/samples/pmic/native/npm1300_one_button/src/main.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include @@ -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) { @@ -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; } @@ -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; diff --git a/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf b/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf index 17dbb54d2e6f..9b840fc2b9ac 100644 --- a/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf +++ b/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf @@ -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 diff --git a/scripts/ci/tags.yaml b/scripts/ci/tags.yaml index 437863e46aec..987c32431bf9 100644 --- a/scripts/ci/tags.yaml +++ b/scripts/ci/tags.yaml @@ -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: diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml index d9217e7c7fcc..15009e7fac32 100644 --- a/scripts/quarantine.yaml +++ b/scripts/quarantine.yaml @@ -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 - nrf54h20dk@0.9.0/nrf54h20/cpuapp - - nrf54l15dk/nrf54l15/cpuapp - - nrf9160dk@0.14.0/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"