From 3863be02a5fcb71dfcc49fdcbf1ca49e3ea1b857 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Mon, 3 May 2021 17:26:38 +0200
Subject: [PATCH] drivers: replace power/power.h with pm/device.h

Drivers need access to the device PM API, so just include pm/device.h.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
---
 drivers/entropy/entropy_cc13xx_cc26xx.c            | 2 +-
 drivers/gpio/gpio_dw.c                             | 2 +-
 drivers/i2c/i2c_cc13xx_cc26xx.c                    | 2 +-
 drivers/interrupt_controller/intc_arcv2_irq_unit.c | 2 +-
 drivers/interrupt_controller/intc_ioapic.c         | 2 +-
 drivers/interrupt_controller/intc_loapic.c         | 2 +-
 drivers/modem/hl7800.c                             | 2 +-
 drivers/serial/uart_cc13xx_cc26xx.c                | 2 +-
 drivers/serial/uart_npcx.c                         | 2 +-
 drivers/spi/spi_cc13xx_cc26xx.c                    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/entropy/entropy_cc13xx_cc26xx.c b/drivers/entropy/entropy_cc13xx_cc26xx.c
index 37ba036aa65..6160e9d2e29 100644
--- a/drivers/entropy/entropy_cc13xx_cc26xx.c
+++ b/drivers/entropy/entropy_cc13xx_cc26xx.c
@@ -10,7 +10,7 @@
 #include <device.h>
 #include <drivers/entropy.h>
 #include <irq.h>
-#include <power/power.h>
+#include <pm/device.h>
 
 #include <sys/ring_buffer.h>
 #include <sys/sys_io.h>
diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c
index 9ca0fcf495c..0acea7731e4 100644
--- a/drivers/gpio/gpio_dw.c
+++ b/drivers/gpio/gpio_dw.c
@@ -29,7 +29,7 @@
 #endif
 
 #ifdef CONFIG_PM_DEVICE
-#include <power/power.h>
+#include <pm/device.h>
 #endif
 
 static int gpio_dw_port_set_bits_raw(const struct device *port, uint32_t mask);
diff --git a/drivers/i2c/i2c_cc13xx_cc26xx.c b/drivers/i2c/i2c_cc13xx_cc26xx.c
index a1d6e3e1a83..98f59d465bb 100644
--- a/drivers/i2c/i2c_cc13xx_cc26xx.c
+++ b/drivers/i2c/i2c_cc13xx_cc26xx.c
@@ -8,7 +8,7 @@
 
 #include <kernel.h>
 #include <drivers/i2c.h>
-#include <power/power.h>
+#include <pm/device.h>
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 #include <logging/log.h>
diff --git a/drivers/interrupt_controller/intc_arcv2_irq_unit.c b/drivers/interrupt_controller/intc_arcv2_irq_unit.c
index e19e25ca70d..191a0df3b48 100644
--- a/drivers/interrupt_controller/intc_arcv2_irq_unit.c
+++ b/drivers/interrupt_controller/intc_arcv2_irq_unit.c
@@ -24,7 +24,7 @@
 extern void *_VectorTable;
 
 #ifdef CONFIG_PM_DEVICE
-#include <power/power.h>
+#include <pm/device.h>
 #include <kernel_structs.h>
 
 #ifdef CONFIG_ARC_SECURE_FIRMWARE
diff --git a/drivers/interrupt_controller/intc_ioapic.c b/drivers/interrupt_controller/intc_ioapic.c
index 58a438c4d44..f1163737741 100644
--- a/drivers/interrupt_controller/intc_ioapic.c
+++ b/drivers/interrupt_controller/intc_ioapic.c
@@ -88,7 +88,7 @@ DEVICE_MMIO_TOPLEVEL_STATIC(ioapic_regs, DT_DRV_INST(0));
 static uint32_t ioapic_rtes;
 
 #ifdef CONFIG_PM_DEVICE
-#include <power/power.h>
+#include <pm/device.h>
 
 #define BITS_PER_IRQ  4
 #define IOAPIC_BITFIELD_HI_LO	0
diff --git a/drivers/interrupt_controller/intc_loapic.c b/drivers/interrupt_controller/intc_loapic.c
index 7fe2e4f849d..142d9426679 100644
--- a/drivers/interrupt_controller/intc_loapic.c
+++ b/drivers/interrupt_controller/intc_loapic.c
@@ -61,7 +61,7 @@
 #define LOPIC_SSPND_BITS_PER_IRQ  1  /* Just the one for enable disable*/
 #define LOPIC_SUSPEND_BITS_REQD (ROUND_UP((LOAPIC_IRQ_COUNT * LOPIC_SSPND_BITS_PER_IRQ), 32))
 #ifdef CONFIG_PM_DEVICE
-#include <power/power.h>
+#include <pm/device.h>
 uint32_t loapic_suspend_buf[LOPIC_SUSPEND_BITS_REQD / 32] = {0};
 static uint32_t loapic_device_power_state = DEVICE_PM_ACTIVE_STATE;
 #endif
diff --git a/drivers/modem/hl7800.c b/drivers/modem/hl7800.c
index 34458e7eb54..9ceccf18cde 100644
--- a/drivers/modem/hl7800.c
+++ b/drivers/modem/hl7800.c
@@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(modem_hl7800, CONFIG_MODEM_LOG_LEVEL);
 #include <device.h>
 #include <init.h>
 
-#include <power/power.h>
+#include <pm/device.h>
 #include <drivers/uart.h>
 
 #include <net/net_context.h>
diff --git a/drivers/serial/uart_cc13xx_cc26xx.c b/drivers/serial/uart_cc13xx_cc26xx.c
index 57ba5fd4593..c7bbcf2a44b 100644
--- a/drivers/serial/uart_cc13xx_cc26xx.c
+++ b/drivers/serial/uart_cc13xx_cc26xx.c
@@ -9,7 +9,7 @@
 #include <device.h>
 #include <errno.h>
 #include <sys/__assert.h>
-#include <power/power.h>
+#include <pm/device.h>
 #include <drivers/uart.h>
 
 #include <driverlib/ioc.h>
diff --git a/drivers/serial/uart_npcx.c b/drivers/serial/uart_npcx.c
index fc0303bcfd8..e44c1e2d5cb 100644
--- a/drivers/serial/uart_npcx.c
+++ b/drivers/serial/uart_npcx.c
@@ -11,7 +11,7 @@
 #include <drivers/uart.h>
 #include <drivers/clock_control.h>
 #include <kernel.h>
-#include <power/power.h>
+#include <pm/device.h>
 #include <soc.h>
 #include "soc_miwu.h"
 
diff --git a/drivers/spi/spi_cc13xx_cc26xx.c b/drivers/spi/spi_cc13xx_cc26xx.c
index 57155810307..c322576cf89 100644
--- a/drivers/spi/spi_cc13xx_cc26xx.c
+++ b/drivers/spi/spi_cc13xx_cc26xx.c
@@ -11,7 +11,7 @@
 LOG_MODULE_REGISTER(spi_cc13xx_cc26xx);
 
 #include <drivers/spi.h>
-#include <power/power.h>
+#include <pm/device.h>
 
 #include <driverlib/prcm.h>
 #include <driverlib/ssi.h>