[nrf fromtree] nPM1304 drivers

boards/nordic/nrf9131ek/nrf9131ek_nrf9131_ns_defconfig

@@ -26,4 +26,3 @@ CONFIG_UART_CONSOLE=y
 CONFIG_I2C=y
 CONFIG_REGULATOR=y
 CONFIG_SENSOR=y
-CONFIG_NPM1300_CHARGER=y

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 {

doc/releases/migration-guide-4.2.rst

@@ -212,13 +212,42 @@ GPIO
 * ``arduino-nano-header-r3`` is renamed to :dtcompatible:`arduino-nano-header`.
   Because the R3 comes from the Arduino UNO R3, which has changed the connector from
   the former version, and is unrelated to the Arduino Nano.
+* Moved file ``include/zephyr/dt-bindings/gpio/nordic-npm1300-gpio.h`` to
+  :zephyr_file:`include/zephyr/dt-bindings/gpio/nordic-npm13xx-gpio.h` and renamed all instances of
+  ``NPM1300`` to ``NPM13XX`` in the defines
+* Renamed ``CONFIG_GPIO_NPM1300`` to :kconfig:option:`CONFIG_GPIO_NPM13XX`,
+  ``CONFIG_GPIO_NPM1300_INIT_PRIORITY`` to :kconfig:option:`CONFIG_GPIO_NPM13XX_INIT_PRIORITY`
 
 I2S
 ===
 * The :dtcompatible:`nxp,mcux-i2s` driver added property ``mclk-output``. Set this property to
 * configure the MCLK signal as an output.  Older driver versions used the macro
 * ``I2S_OPT_BIT_CLK_SLAVE`` to configure the MCLK signal direction. (:github:`88554`)
 
+LED
+===
+
+* Renamed ``CONFIG_LED_NPM1300`` to :kconfig:option:`CONFIG_LED_NPM13XX`
+
+MFD
+===
+
+* Moved file ``include/zephyr/drivers/mfd/npm1300.h`` to :zephyr_file:`include/zephyr/drivers/mfd/npm13xx.h`
+  and renamed all instances of ``npm1300``/``NPM1300`` to ``npm13xx``/``NPM13XX`` in the enums and
+  function names
+* Renamed ``CONFIG_MFD_NPM1300`` to :kconfig:option:`CONFIG_MFD_NPM13XX`,
+  ``CONFIG_MFD_NPM1300_INIT_PRIORITY`` to :kconfig:option:`CONFIG_MFD_NPM13XX_INIT_PRIORITY`
+
+Regulator
+=========
+
+* Moved file ``include/zephyr/dt-bindings/regulator/npm1300.h`` to
+  :zephyr_file:`include/zephyr/dt-bindings/regulator/npm13xx.h` and renamed all instances of
+  ``NPM1300`` to ``NPM13XX`` in the defines
+* Renamed ``CONFIG_REGULATOR_NPM1300`` to :kconfig:option:`CONFIG_REGULATOR_NPM13XX`,
+  ``CONFIG_REGULATOR_NPM1300_COMMON_INIT_PRIORITY`` to :kconfig:option:`REGULATOR_NPM13XX_COMMON_INIT_PRIORITY`,
+  ``CONFIG_REGULATOR_NPM1300_INIT_PRIORITY`` to :kconfig:option:`CONFIG_REGULATOR_NPM13XX_INIT_PRIORITY`
+
 Sensors
 =======
 
@@ -255,6 +284,12 @@ Sensors
 * The binding file for :dtcompatible:`raspberrypi,pico-temp.yaml` has been renamed to have a name
   matching the compatible string.
 
+* Moved file ``include/zephyr/drivers/sensor/npm1300_charger.h`` to
+  :zephyr_file:`include/zephyr/drivers/sensor/npm13xx_charger.h` and renamed all instances of
+  ``NPM1300`` to ``NPM13XX`` in the enums
+
+* Renamed ``CONFIG_NPM1300_CHARGER`` to :kconfig:option:`CONFIG_NPM13XX_CHARGER`
+
 Serial
 =======
 
@@ -304,6 +339,11 @@ Timer
         reg-names = "mtime", "mtimecmp";
     };
 
+Watchdog
+========
+* Renamed ``CONFIG_WDT_NPM1300`` to :kconfig:option:`CONFIG_WDT_NPM13XX`,
+  ``CONFIG_WDT_NPM1300_INIT_PRIORITY`` to :kconfig:option:`CONFIG_WDT_NPM13XX_INIT_PRIORITY`
+
 Modem
 =====
 

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_NPM13XX    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)

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"

drivers/gpio/Kconfig.npm13xx

@@ -0,0 +1,19 @@
+# Copyright (c) 2023 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config GPIO_NPM13XX
+	bool "nPM13xx GPIO driver"
+	default y
+	depends on DT_HAS_NORDIC_NPM1300_GPIO_ENABLED || DT_HAS_NORDIC_NPM1304_GPIO_ENABLED
+	select I2C
+	select MFD
+	help
+	  Enable the nPM13xx GPIO driver.
+
+config GPIO_NPM13XX_INIT_PRIORITY
+	int "nPM13xx GPIO driver initialization priority"
+	depends on GPIO_NPM13XX
+	default 85
+	help
+	  Initialization priority for the nPM13xx GPIO driver. It must be
+	  greater than the I2C controller init priority.