npm1300: rename npm1300 to npm13xx

seov-nordic · nordic-piks · commit 62d925898536 · 2025-07-03T10:26:23.000+02:00
Rename relevant occurrences of npm1300 to npm13xx in device tree and
config files, sample code, etc.

Signed-off-by: Sergei Ovchinnikov &lt;sergei.ovchinnikov@nordicsemi.no&gt;
diff --git a/boards/nordic/thingy91x/Kconfig.defconfig b/boards/nordic/thingy91x/Kconfig.defconfig
@@ -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
 
diff --git 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
@@ -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 {
@@ -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;
 			};
 		};
diff --git 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 <dt-bindings/regulator/npm1300.h>
+ #include <dt-bindings/regulator/npm13xx.h>
 
 &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
@@ -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>
 
@@ -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
@@ -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>
 
@@ -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
@@ -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 {
@@ -13,7 +13,7 @@
 };
 
 &npm1300_ek_ldo1 {
-	regulator-initial-mode = <NPM1300_LDSW_MODE_LDSW>;
+	regulator-initial-mode = <NPM13XX_LDSW_MODE_LDSW>;
 };
 
 &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
@@ -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 {
@@ -13,7 +13,7 @@
 };
 
 &npm1300_ek_ldo1 {
-	regulator-initial-mode = <NPM1300_LDSW_MODE_LDSW>;
+	regulator-initial-mode = <NPM13XX_LDSW_MODE_LDSW>;
 };
 
 &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
@@ -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 {
@@ -13,7 +13,7 @@
 };
 
 &npm1300_ek_ldo1 {
-	regulator-initial-mode = <NPM1300_LDSW_MODE_LDSW>;
+	regulator-initial-mode = <NPM13XX_LDSW_MODE_LDSW>;
 };
 
 &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
@@ -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 {
@@ -21,7 +21,7 @@
 };
 
 &npm1300_ek_ldo1 {
-	regulator-initial-mode = <NPM1300_LDSW_MODE_LDSW>;
+	regulator-initial-mode = <NPM13XX_LDSW_MODE_LDSW>;
 };
 
 &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
@@ -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 {
@@ -17,7 +17,7 @@
 };
 
 &npm1300_ek_ldo1 {
-	regulator-initial-mode = <NPM1300_LDSW_MODE_LDSW>;
+	regulator-initial-mode = <NPM13XX_LDSW_MODE_LDSW>;
 };
 
 &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
@@ -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 {
@@ -13,7 +13,7 @@
 };
 
 &npm1300_ek_ldo1 {
-	regulator-initial-mode = <NPM1300_LDSW_MODE_LDSW>;
+	regulator-initial-mode = <NPM13XX_LDSW_MODE_LDSW>;
 };
 
 &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
@@ -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>
@@ -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
@@ -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
@@ -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:
