[nrf fromtree] drivers: npm1300: rename to npm13xx

seov-nordic · seov-nordic · commit 1c81ce72b279 · 2025-06-30T15:25:45.000+02:00
Rename npm1300 drivers and header files to npm13xx to allow for usage with other nPM13xx product variants. Signed-off-by: Sergei Ovchinnikov <sergei.ovchinnikov@nordicsemi.no> (cherry picked from commit fb007db)
diff --git a/boards/shields/npm1300_ek/npm1300_ek.overlay b/boards/shields/npm1300_ek/npm1300_ek.overlay
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <dt-bindings/regulator/npm1300.h>
+#include <dt-bindings/regulator/npm13xx.h>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 
 &arduino_i2c {
diff --git a/drivers/gpio/CMakeLists.txt b/drivers/gpio/CMakeLists.txt
@@ -67,7 +67,7 @@ zephyr_library_sources_ifdef(CONFIG_GPIO_NCT38XX    gpio_nct38xx_port.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_NCT38XX_ALERT  gpio_nct38xx_alert.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_NEORV32    gpio_neorv32.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_NPCX       gpio_npcx.c)
-zephyr_library_sources_ifdef(CONFIG_GPIO_NPM1300    gpio_npm1300.c)
+zephyr_library_sources_ifdef(CONFIG_GPIO_NPM1300    gpio_npm13xx.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_NPM2100    gpio_npm2100.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_NPM6001    gpio_npm6001.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_NRFX       gpio_nrfx.c)
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
@@ -153,7 +153,7 @@ source "drivers/gpio/Kconfig.mspm0"
 source "drivers/gpio/Kconfig.nct38xx"
 source "drivers/gpio/Kconfig.neorv32"
 source "drivers/gpio/Kconfig.npcx"
-source "drivers/gpio/Kconfig.npm1300"
+source "drivers/gpio/Kconfig.npm13xx"
 source "drivers/gpio/Kconfig.npm2100"
 source "drivers/gpio/Kconfig.npm6001"
 source "drivers/gpio/Kconfig.nrfx"
diff --git a/drivers/gpio/Kconfig.npm13xx b/drivers/gpio/Kconfig.npm13xx
diff --git a/drivers/gpio/gpio_npm13xx.c b/drivers/gpio/gpio_npm13xx.c
@@ -9,8 +9,8 @@
 
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/gpio/gpio_utils.h>
-#include <zephyr/drivers/mfd/npm1300.h>
-#include <zephyr/dt-bindings/gpio/nordic-npm1300-gpio.h>
+#include <zephyr/drivers/mfd/npm13xx.h>
+#include <zephyr/dt-bindings/gpio/nordic-npm13xx-gpio.h>
 #include <zephyr/kernel.h>
 #include <zephyr/sys/util_macro.h>
 
diff --git a/drivers/led/CMakeLists.txt b/drivers/led/CMakeLists.txt
@@ -12,7 +12,7 @@ zephyr_library_sources_ifdef(CONFIG_IS31FL3733 is31fl3733.c)
 zephyr_library_sources_ifdef(CONFIG_LED_AXP192_AXP2101 led_axp192.c)
 zephyr_library_sources_ifdef(CONFIG_LED_DAC led_dac.c)
 zephyr_library_sources_ifdef(CONFIG_LED_GPIO led_gpio.c)
-zephyr_library_sources_ifdef(CONFIG_LED_NPM1300 led_npm1300.c)
+zephyr_library_sources_ifdef(CONFIG_LED_NPM1300 led_npm13xx.c)
 zephyr_library_sources_ifdef(CONFIG_LED_PWM led_pwm.c)
 zephyr_library_sources_ifdef(CONFIG_LED_XEC led_mchp_xec.c)
 zephyr_library_sources_ifdef(CONFIG_LP3943 lp3943.c)
diff --git a/drivers/led/Kconfig b/drivers/led/Kconfig
@@ -40,7 +40,7 @@ source "drivers/led/Kconfig.lp5562"
 source "drivers/led/Kconfig.lp5569"
 source "drivers/led/Kconfig.modulino"
 source "drivers/led/Kconfig.ncp5623"
-source "drivers/led/Kconfig.npm1300"
+source "drivers/led/Kconfig.npm13xx"
 source "drivers/led/Kconfig.pca9633"
 source "drivers/led/Kconfig.pwm"
 source "drivers/led/Kconfig.tlc59108"
diff --git a/drivers/led/Kconfig.npm13xx b/drivers/led/Kconfig.npm13xx
diff --git a/drivers/led/led_npm13xx.c b/drivers/led/led_npm13xx.c
@@ -9,7 +9,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/led.h>
-#include <zephyr/drivers/mfd/npm1300.h>
+#include <zephyr/drivers/mfd/npm13xx.h>
 
 /* nPM1300 LED base address */
 #define NPM_LED_BASE 0x0AU
diff --git a/drivers/mfd/CMakeLists.txt b/drivers/mfd/CMakeLists.txt
@@ -6,7 +6,7 @@ zephyr_library()
 zephyr_library_sources_ifdef(CONFIG_MFD_ADP5585 mfd_adp5585.c)
 zephyr_library_sources_ifdef(CONFIG_MFD_MAX20335 mfd_max20335.c)
 zephyr_library_sources_ifdef(CONFIG_MFD_NCT38XX mfd_nct38xx.c)
-zephyr_library_sources_ifdef(CONFIG_MFD_NPM1300 mfd_npm1300.c)
+zephyr_library_sources_ifdef(CONFIG_MFD_NPM1300 mfd_npm13xx.c)
 zephyr_library_sources_ifdef(CONFIG_MFD_NPM2100 mfd_npm2100.c)
 zephyr_library_sources_ifdef(CONFIG_MFD_NPM6001 mfd_npm6001.c)
 zephyr_library_sources_ifdef(CONFIG_MFD_AXP192_AXP2101 mfd_axp192.c)
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
@@ -30,7 +30,7 @@ source "drivers/mfd/Kconfig.max31790"
 source "drivers/mfd/Kconfig.maxq10xx"
 source "drivers/mfd/Kconfig.mchp_sam"
 source "drivers/mfd/Kconfig.nct38xx"
-source "drivers/mfd/Kconfig.npm1300"
+source "drivers/mfd/Kconfig.npm13xx"
 source "drivers/mfd/Kconfig.npm2100"
 source "drivers/mfd/Kconfig.npm6001"
 source "drivers/mfd/Kconfig.pf1550"
diff --git a/drivers/mfd/Kconfig.npm13xx b/drivers/mfd/Kconfig.npm13xx
diff --git a/drivers/mfd/mfd_npm13xx.c b/drivers/mfd/mfd_npm13xx.c
@@ -12,7 +12,7 @@
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/gpio/gpio_utils.h>
-#include <zephyr/drivers/mfd/npm1300.h>
+#include <zephyr/drivers/mfd/npm13xx.h>
 
 #define TIME_BASE 0x07U
 #define MAIN_BASE 0x00U
diff --git a/drivers/regulator/CMakeLists.txt b/drivers/regulator/CMakeLists.txt
@@ -13,7 +13,7 @@ zephyr_library_sources_ifdef(CONFIG_REGULATOR_FIXED regulator_fixed.c)
 zephyr_library_sources_ifdef(CONFIG_REGULATOR_GPIO regulator_gpio.c)
 zephyr_library_sources_ifdef(CONFIG_REGULATOR_MAX20335 regulator_max20335.c)
 zephyr_library_sources_ifdef(CONFIG_REGULATOR_NPM1100 regulator_npm1100.c)
-zephyr_library_sources_ifdef(CONFIG_REGULATOR_NPM1300 regulator_npm1300.c)
+zephyr_library_sources_ifdef(CONFIG_REGULATOR_NPM1300 regulator_npm13xx.c)
 zephyr_library_sources_ifdef(CONFIG_REGULATOR_NPM2100 regulator_npm2100.c)
 zephyr_library_sources_ifdef(CONFIG_REGULATOR_NPM6001 regulator_npm6001.c)
 zephyr_library_sources_ifdef(CONFIG_REGULATOR_PCA9420 regulator_pca9420.c)
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
@@ -35,7 +35,7 @@ source "drivers/regulator/Kconfig.fixed"
 source "drivers/regulator/Kconfig.gpio"
 source "drivers/regulator/Kconfig.max20335"
 source "drivers/regulator/Kconfig.npm1100"
-source "drivers/regulator/Kconfig.npm1300"
+source "drivers/regulator/Kconfig.npm13xx"
 source "drivers/regulator/Kconfig.npm2100"
 source "drivers/regulator/Kconfig.npm6001"
 source "drivers/regulator/Kconfig.pca9420"
diff --git a/drivers/regulator/Kconfig.npm13xx b/drivers/regulator/Kconfig.npm13xx
diff --git a/drivers/regulator/regulator_npm13xx.c b/drivers/regulator/regulator_npm13xx.c
@@ -10,8 +10,8 @@
 
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/regulator.h>
-#include <zephyr/drivers/mfd/npm1300.h>
-#include <zephyr/dt-bindings/regulator/npm1300.h>
+#include <zephyr/drivers/mfd/npm13xx.h>
+#include <zephyr/dt-bindings/regulator/npm13xx.h>
 #include <zephyr/sys/linear_range.h>
 #include <zephyr/sys/util.h>
 
diff --git a/drivers/sensor/nordic/CMakeLists.txt b/drivers/sensor/nordic/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 # zephyr-keep-sorted-start
 add_subdirectory(temp)
-add_subdirectory_ifdef(CONFIG_NPM1300_CHARGER npm1300_charger)
+add_subdirectory_ifdef(CONFIG_NPM1300_CHARGER npm13xx_charger)
 add_subdirectory_ifdef(CONFIG_NPM2100_VBAT npm2100_vbat)
 add_subdirectory_ifdef(CONFIG_QDEC_NRFX qdec_nrfx)
 # zephyr-keep-sorted-stop
diff --git a/drivers/sensor/nordic/Kconfig b/drivers/sensor/nordic/Kconfig
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # zephyr-keep-sorted-start
-source "drivers/sensor/nordic/npm1300_charger/Kconfig"
+source "drivers/sensor/nordic/npm13xx_charger/Kconfig"
 source "drivers/sensor/nordic/npm2100_vbat/Kconfig"
 source "drivers/sensor/nordic/qdec_nrfx/Kconfig"
 source "drivers/sensor/nordic/temp/Kconfig"
diff --git a/drivers/sensor/nordic/npm13xx_charger/CMakeLists.txt b/drivers/sensor/nordic/npm13xx_charger/CMakeLists.txt
@@ -4,4 +4,4 @@
 
 zephyr_library()
 
-zephyr_library_sources(npm1300_charger.c)
+zephyr_library_sources(npm13xx_charger.c)
diff --git a/drivers/sensor/nordic/npm13xx_charger/Kconfig b/drivers/sensor/nordic/npm13xx_charger/Kconfig
diff --git a/drivers/sensor/nordic/npm13xx_charger/npm13xx_charger.c b/drivers/sensor/nordic/npm13xx_charger/npm13xx_charger.c
@@ -7,10 +7,10 @@
 
 #include <math.h>
 #include <zephyr/drivers/sensor.h>
-#include <zephyr/drivers/mfd/npm1300.h>
+#include <zephyr/drivers/mfd/npm13xx.h>
 #include <zephyr/kernel.h>
 #include <zephyr/sys/linear_range.h>
-#include <zephyr/drivers/sensor/npm1300_charger.h>
+#include <zephyr/drivers/sensor/npm13xx_charger.h>
 
 struct npm1300_charger_config {
 	const struct device *mfd;
diff --git a/drivers/watchdog/CMakeLists.txt b/drivers/watchdog/CMakeLists.txt
@@ -28,7 +28,7 @@ zephyr_library_sources_ifdef(CONFIG_WDT_MCUX_WDOG wdt_mcux_wdog.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_MCUX_WDOG32 wdt_mcux_wdog32.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_MCUX_WWDT wdt_mcux_wwdt.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_NPCX wdt_npcx.c)
-zephyr_library_sources_ifdef(CONFIG_WDT_NPM1300 wdt_npm1300.c)
+zephyr_library_sources_ifdef(CONFIG_WDT_NPM1300 wdt_npm13xx.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_NPM2100 wdt_npm2100.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_NPM6001 wdt_npm6001.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_NRFX wdt_nrfx.c)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
@@ -107,7 +107,7 @@ source "drivers/watchdog/Kconfig.rpi_pico"
 
 source "drivers/watchdog/Kconfig.gd32"
 
-source "drivers/watchdog/Kconfig.npm1300"
+source "drivers/watchdog/Kconfig.npm13xx"
 
 source "drivers/watchdog/Kconfig.npm2100"
 
diff --git a/drivers/watchdog/Kconfig.npm13xx b/drivers/watchdog/Kconfig.npm13xx
diff --git a/drivers/watchdog/wdt_npm13xx.c b/drivers/watchdog/wdt_npm13xx.c
@@ -10,8 +10,8 @@
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/watchdog.h>
-#include <zephyr/drivers/mfd/npm1300.h>
-#include <zephyr/dt-bindings/gpio/nordic-npm1300-gpio.h>
+#include <zephyr/drivers/mfd/npm13xx.h>
+#include <zephyr/dt-bindings/gpio/nordic-npm13xx-gpio.h>
 
 /* nPM1300 TIMER base address */
 #define TIME_BASE 0x07U
diff --git a/include/zephyr/drivers/mfd/npm13xx.h b/include/zephyr/drivers/mfd/npm13xx.h
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_DRIVERS_MFD_NPM1300_H_
-#define ZEPHYR_INCLUDE_DRIVERS_MFD_NPM1300_H_
+#ifndef ZEPHYR_INCLUDE_DRIVERS_MFD_NPM13XX_H_
+#define ZEPHYR_INCLUDE_DRIVERS_MFD_NPM13XX_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -163,4 +163,4 @@ int mfd_npm1300_remove_callback(const struct device *dev, struct gpio_callback *
 }
 #endif
 
-#endif /* ZEPHYR_INCLUDE_DRIVERS_MFD_NPM1300_H_ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_MFD_NPM13XX_H_ */
diff --git a/include/zephyr/drivers/sensor/npm13xx_charger.h b/include/zephyr/drivers/sensor/npm13xx_charger.h
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_DRIVERS_SENSOR_NPM1300_CHARGER_H_
-#define ZEPHYR_INCLUDE_DRIVERS_SENSOR_NPM1300_CHARGER_H_
+#ifndef ZEPHYR_INCLUDE_DRIVERS_SENSOR_NPM13XX_CHARGER_H_
+#define ZEPHYR_INCLUDE_DRIVERS_SENSOR_NPM13XX_CHARGER_H_
 
 #include <zephyr/drivers/sensor.h>
 
diff --git a/include/zephyr/dt-bindings/gpio/nordic-npm13xx-gpio.h b/include/zephyr/dt-bindings/gpio/nordic-npm13xx-gpio.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_NORDIC_NPM1300_GPIO_H_
-#define ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_NORDIC_NPM1300_GPIO_H_
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_NORDIC_NPM13XX_GPIO_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_NORDIC_NPM13XX_GPIO_H_
 
 /**
  * @brief nPM1300-specific GPIO Flags
@@ -96,4 +96,4 @@
 
 /** @} */
 
-#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_NORDIC_NPM1300_GPIO_H_ */
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_NORDIC_NPM13XX_GPIO_H_ */
diff --git a/include/zephyr/dt-bindings/regulator/npm13xx.h b/include/zephyr/dt-bindings/regulator/npm13xx.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_REGULATOR_NPM1300_H_
-#define ZEPHYR_INCLUDE_DT_BINDINGS_REGULATOR_NPM1300_H_
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_REGULATOR_NPM13XX_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_REGULATOR_NPM13XX_H_
 
 /**
  * @defgroup regulator_npm1300 NPM1300 Devicetree helpers.
@@ -38,4 +38,4 @@
 
 /** @} */
 
-#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_REGULATOR_NPM1300_H_*/
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_REGULATOR_NPM13XX_H_*/
diff --git a/samples/shields/npm1300_ek/src/main.c b/samples/shields/npm1300_ek/src/main.c
@@ -9,10 +9,10 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/regulator.h>
 #include <zephyr/drivers/sensor.h>
-#include <zephyr/drivers/sensor/npm1300_charger.h>
+#include <zephyr/drivers/sensor/npm13xx_charger.h>
 #include <zephyr/drivers/led.h>
-#include <zephyr/dt-bindings/regulator/npm1300.h>
-#include <zephyr/drivers/mfd/npm1300.h>
+#include <zephyr/dt-bindings/regulator/npm13xx.h>
+#include <zephyr/drivers/mfd/npm13xx.h>
 #include <zephyr/sys/printk.h>
 #include <getopt.h>
 
