From aa2bdbe3222068b773c8979244a6b789d12eb702 Mon Sep 17 00:00:00 2001
From: Kumar Gala <kumar.gala@linaro.org>
Date: Wed, 31 Oct 2018 12:44:45 -0500
Subject: [PATCH] drivers: Remove board.h include

We either don't need board.h in the driver or we should be include soc.h
instead.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
---
 drivers/adc/adc_dw.c                                 | 2 +-
 drivers/adc/adc_intel_quark_d2000.c                  | 2 +-
 drivers/aio/aio_comparator_qmsi.c                    | 2 +-
 drivers/bluetooth/hci/h5.c                           | 1 -
 drivers/bluetooth/hci/userchan.c                     | 1 -
 drivers/can/stm32_can.c                              | 2 +-
 drivers/clock_control/quark_se_clock_control.c       | 2 +-
 drivers/console/uart_console.c                       | 1 -
 drivers/console/uart_pipe.c                          | 1 -
 drivers/dma/dma_cavs.c                               | 1 -
 drivers/dma/dma_qmsi.c                               | 2 +-
 drivers/dma/dma_stm32f4x.c                           | 1 -
 drivers/ethernet/eth_dw.c                            | 2 +-
 drivers/ethernet/eth_mcux.c                          | 1 -
 drivers/gpio/gpio_dw.c                               | 2 +-
 drivers/gpio/gpio_qmsi_ss.c                          | 2 +-
 drivers/gpio/gpio_sch.c                              | 2 +-
 drivers/i2c/i2c_atmel_sam3.c                         | 1 -
 drivers/i2c/i2c_dw.c                                 | 2 +-
 drivers/i2c/i2c_gecko.c                              | 2 +-
 drivers/i2c/i2c_ll_stm32.c                           | 2 +-
 drivers/i2c/i2c_ll_stm32_v1.c                        | 2 +-
 drivers/i2c/i2c_ll_stm32_v2.c                        | 2 +-
 drivers/i2c/i2c_qmsi_ss.c                            | 2 +-
 drivers/i2c/i2c_sbcon.c                              | 1 -
 drivers/ieee802154/ieee802154_cc1200.c               | 1 -
 drivers/ieee802154/ieee802154_cc2520.c               | 1 -
 drivers/ieee802154/ieee802154_kw41z.c                | 1 -
 drivers/ieee802154/ieee802154_mcr20a.c               | 1 -
 drivers/ieee802154/ieee802154_nrf5.c                 | 2 +-
 drivers/ieee802154/ieee802154_uart_pipe.c            | 1 -
 drivers/interrupt_controller/arcv2_irq_unit.c        | 1 -
 drivers/interrupt_controller/cavs_ictl.c             | 1 -
 drivers/interrupt_controller/dw_ictl.c               | 1 -
 drivers/interrupt_controller/i8259.c                 | 2 --
 drivers/interrupt_controller/ioapic_intr.c           | 2 --
 drivers/interrupt_controller/loapic_intr.c           | 1 -
 drivers/interrupt_controller/shared_irq.c            | 1 -
 drivers/interrupt_controller/system_apic.c           | 1 -
 drivers/ipm/ipm_quark_se.h                           | 2 +-
 drivers/led_strip/ws2812b_sw.c                       | 2 +-
 drivers/pci/pci.c                                    | 2 +-
 drivers/pci/pci_interface.c                          | 2 +-
 drivers/pci/pci_legacy_bridge.c                      | 2 +-
 drivers/pinmux/dev/pinmux_dev_arm_beetle.c           | 1 -
 drivers/pinmux/dev/pinmux_dev_atmel_sam3x.c          | 1 -
 drivers/pwm/pwm_dw.c                                 | 1 -
 drivers/pwm/pwm_led_esp32.c                          | 1 -
 drivers/pwm/pwm_stm32.c                              | 2 +-
 drivers/rtc/rtc_ll_stm32.c                           | 2 +-
 drivers/serial/leuart_gecko.c                        | 2 +-
 drivers/serial/uart_cmsdk_apb.c                      | 1 -
 drivers/serial/uart_imx.c                            | 2 +-
 drivers/serial/uart_ns16550.c                        | 1 -
 drivers/serial/uart_nsim.c                           | 1 -
 drivers/serial/uart_psoc6.c                          | 1 -
 drivers/serial/uart_sifive.c                         | 1 -
 drivers/serial/uart_stellaris.c                      | 2 +-
 drivers/serial/uart_stm32.c                          | 2 +-
 drivers/spi/spi_dw.c                                 | 2 +-
 drivers/spi/spi_intel.c                              | 2 +-
 drivers/spi/spi_ll_stm32.c                           | 2 +-
 drivers/timer/arcv2_timer0.c                         | 2 +-
 drivers/timer/cortex_m_systick.c                     | 2 --
 drivers/timer/hpet.c                                 | 2 --
 drivers/timer/loapic_timer.c                         | 1 -
 drivers/timer/pulpino_timer.c                        | 1 -
 drivers/timer/riscv_machine_timer.c                  | 1 -
 drivers/usb/device/usb_dc_kinetis.c                  | 1 -
 drivers/usb/device/usb_dw_registers.h                | 1 -
 drivers/wifi/winc1500/wifi_winc1500_nm_bsp.c         | 2 --
 drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c | 1 -
 72 files changed, 32 insertions(+), 77 deletions(-)

diff --git a/drivers/adc/adc_dw.c b/drivers/adc/adc_dw.c
index 99b2ce3f9fe..40b1ff3b851 100644
--- a/drivers/adc/adc_dw.c
+++ b/drivers/adc/adc_dw.c
@@ -12,7 +12,7 @@
 #include <kernel.h>
 #include <string.h>
 #include <stdlib.h>
-#include <board.h>
+#include <soc.h>
 #include <adc.h>
 #include <arch/cpu.h>
 
diff --git a/drivers/adc/adc_intel_quark_d2000.c b/drivers/adc/adc_intel_quark_d2000.c
index 35e8b07414f..424f44ba96e 100644
--- a/drivers/adc/adc_intel_quark_d2000.c
+++ b/drivers/adc/adc_intel_quark_d2000.c
@@ -10,7 +10,7 @@
 #include <kernel.h>
 #include <string.h>
 #include <stdlib.h>
-#include <board.h>
+#include <soc.h>
 #include <adc.h>
 #include <arch/cpu.h>
 
diff --git a/drivers/aio/aio_comparator_qmsi.c b/drivers/aio/aio_comparator_qmsi.c
index 3a41285e7fc..690f48afb3a 100644
--- a/drivers/aio/aio_comparator_qmsi.c
+++ b/drivers/aio/aio_comparator_qmsi.c
@@ -8,7 +8,7 @@
 
 #include <stdio.h>
 #include <kernel.h>
-#include <board.h>
+#include <soc.h>
 #include <device.h>
 #include <init.h>
 #include <aio_comparator.h>
diff --git a/drivers/bluetooth/hci/h5.c b/drivers/bluetooth/hci/h5.c
index 62061ebdefb..0630c3dbb47 100644
--- a/drivers/bluetooth/hci/h5.c
+++ b/drivers/bluetooth/hci/h5.c
@@ -11,7 +11,6 @@
 
 #include <zephyr.h>
 
-#include <board.h>
 #include <init.h>
 #include <uart.h>
 #include <misc/util.h>
diff --git a/drivers/bluetooth/hci/userchan.c b/drivers/bluetooth/hci/userchan.c
index 8b8ac15cd3d..0d76f947171 100644
--- a/drivers/bluetooth/hci/userchan.c
+++ b/drivers/bluetooth/hci/userchan.c
@@ -9,7 +9,6 @@
 #include <zephyr.h>
 #include <device.h>
 #include <init.h>
-#include <board.h>
 #include <misc/util.h>
 #include <misc/byteorder.h>
 
diff --git a/drivers/can/stm32_can.c b/drivers/can/stm32_can.c
index 7bf15c90846..630e2f72cf4 100644
--- a/drivers/can/stm32_can.c
+++ b/drivers/can/stm32_can.c
@@ -9,7 +9,7 @@
 #include <misc/util.h>
 #include <string.h>
 #include <kernel.h>
-#include <board.h>
+#include <soc.h>
 #include <errno.h>
 #include <stdbool.h>
 #include "stm32_can.h"
diff --git a/drivers/clock_control/quark_se_clock_control.c b/drivers/clock_control/quark_se_clock_control.c
index ed6353d67ad..38bdddea8ad 100644
--- a/drivers/clock_control/quark_se_clock_control.c
+++ b/drivers/clock_control/quark_se_clock_control.c
@@ -10,7 +10,7 @@
 #include <arch/cpu.h>
 
 #include <misc/__assert.h>
-#include <board.h>
+#include <soc.h>
 #include <device.h>
 #include <init.h>
 
diff --git a/drivers/console/uart_console.c b/drivers/console/uart_console.c
index ef002cc7f52..c056c3f809c 100644
--- a/drivers/console/uart_console.c
+++ b/drivers/console/uart_console.c
@@ -24,7 +24,6 @@
 #include <device.h>
 #include <init.h>
 
-#include <board.h>
 #include <uart.h>
 #include <console/console.h>
 #include <console/uart_console.h>
diff --git a/drivers/console/uart_pipe.c b/drivers/console/uart_pipe.c
index b4f75286fd7..c6991daa4ce 100644
--- a/drivers/console/uart_pipe.c
+++ b/drivers/console/uart_pipe.c
@@ -13,7 +13,6 @@
 
 #include <kernel.h>
 
-#include <board.h>
 #include <uart.h>
 
 #include <console/uart_pipe.h>
diff --git a/drivers/dma/dma_cavs.c b/drivers/dma/dma_cavs.c
index 16fc3cf4a2d..5beed41cd80 100644
--- a/drivers/dma/dma_cavs.c
+++ b/drivers/dma/dma_cavs.c
@@ -9,7 +9,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <kernel.h>
-#include <board.h>
 #include <device.h>
 #include <init.h>
 #include <dma.h>
diff --git a/drivers/dma/dma_qmsi.c b/drivers/dma/dma_qmsi.c
index 13cf1908465..11ccaa638fb 100644
--- a/drivers/dma/dma_qmsi.c
+++ b/drivers/dma/dma_qmsi.c
@@ -8,7 +8,7 @@
 
 #include <stdio.h>
 #include <kernel.h>
-#include <board.h>
+#include <soc.h>
 #include <device.h>
 #include <init.h>
 #include <dma.h>
diff --git a/drivers/dma/dma_stm32f4x.c b/drivers/dma/dma_stm32f4x.c
index 993fa204839..0e5f5333b02 100644
--- a/drivers/dma/dma_stm32f4x.c
+++ b/drivers/dma/dma_stm32f4x.c
@@ -6,7 +6,6 @@
  */
 
 
-#include <board.h>
 #include <device.h>
 #include <dma.h>
 #include <errno.h>
diff --git a/drivers/ethernet/eth_dw.c b/drivers/ethernet/eth_dw.c
index 5bd9ec9e948..a22d9303d2b 100644
--- a/drivers/ethernet/eth_dw.c
+++ b/drivers/ethernet/eth_dw.c
@@ -9,7 +9,7 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-#include <board.h>
+#include <soc.h>
 #include <device.h>
 #include <errno.h>
 #include <init.h>
diff --git a/drivers/ethernet/eth_mcux.c b/drivers/ethernet/eth_mcux.c
index ca25aee39bf..2e78b716bab 100644
--- a/drivers/ethernet/eth_mcux.c
+++ b/drivers/ethernet/eth_mcux.c
@@ -19,7 +19,6 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-#include <board.h>
 #include <device.h>
 #include <misc/util.h>
 #include <kernel.h>
diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c
index 51c0d3366dc..044f9010f2f 100644
--- a/drivers/gpio/gpio_dw.c
+++ b/drivers/gpio/gpio_dw.c
@@ -11,7 +11,7 @@
 #include "gpio_dw.h"
 #include "gpio_utils.h"
 
-#include <board.h>
+#include <soc.h>
 #include <sys_io.h>
 #include <init.h>
 #include <misc/util.h>
diff --git a/drivers/gpio/gpio_qmsi_ss.c b/drivers/gpio/gpio_qmsi_ss.c
index c95dcc1b5c4..22ab5f46e10 100644
--- a/drivers/gpio/gpio_qmsi_ss.c
+++ b/drivers/gpio/gpio_qmsi_ss.c
@@ -7,7 +7,7 @@
 #include <errno.h>
 
 #include <gpio.h>
-#include <board.h>
+#include <soc.h>
 #include <misc/util.h>
 
 #include "qm_ss_gpio.h"
diff --git a/drivers/gpio/gpio_sch.c b/drivers/gpio/gpio_sch.c
index 73b92d65ec4..bba93caa0c0 100644
--- a/drivers/gpio/gpio_sch.c
+++ b/drivers/gpio/gpio_sch.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 
 #include <kernel.h>
-#include <board.h>
+#include <soc.h>
 #include <init.h>
 #include <sys_io.h>
 #include <misc/util.h>
diff --git a/drivers/i2c/i2c_atmel_sam3.c b/drivers/i2c/i2c_atmel_sam3.c
index 3b6565d42d1..103d4548f55 100644
--- a/drivers/i2c/i2c_atmel_sam3.c
+++ b/drivers/i2c/i2c_atmel_sam3.c
@@ -29,7 +29,6 @@
 
 #include <kernel.h>
 
-#include <board.h>
 #include <i2c.h>
 #include <sys_clock.h>
 
diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c
index e4f698bf6b5..a00cf97758a 100644
--- a/drivers/i2c/i2c_dw.c
+++ b/drivers/i2c/i2c_dw.c
@@ -16,7 +16,7 @@
 #include <arch/cpu.h>
 #include <string.h>
 
-#include <board.h>
+#include <soc.h>
 #include <errno.h>
 #include <sys_io.h>
 
diff --git a/drivers/i2c/i2c_gecko.c b/drivers/i2c/i2c_gecko.c
index cc7778594ec..8d2c055b937 100644
--- a/drivers/i2c/i2c_gecko.c
+++ b/drivers/i2c/i2c_gecko.c
@@ -10,7 +10,7 @@
 #include <em_cmu.h>
 #include <em_i2c.h>
 #include <em_gpio.h>
-#include <board.h>
+#include <soc.h>
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 #include <logging/log.h>
diff --git a/drivers/i2c/i2c_ll_stm32.c b/drivers/i2c/i2c_ll_stm32.c
index 4be728aba10..28b8d438e6b 100644
--- a/drivers/i2c/i2c_ll_stm32.c
+++ b/drivers/i2c/i2c_ll_stm32.c
@@ -9,7 +9,7 @@
 #include <clock_control.h>
 #include <misc/util.h>
 #include <kernel.h>
-#include <board.h>
+#include <soc.h>
 #include <errno.h>
 #include <i2c.h>
 #include "i2c_ll_stm32.h"
diff --git a/drivers/i2c/i2c_ll_stm32_v1.c b/drivers/i2c/i2c_ll_stm32_v1.c
index 74764558b77..6c3e17fbb4f 100644
--- a/drivers/i2c/i2c_ll_stm32_v1.c
+++ b/drivers/i2c/i2c_ll_stm32_v1.c
@@ -12,7 +12,7 @@
 #include <clock_control.h>
 #include <misc/util.h>
 #include <kernel.h>
-#include <board.h>
+#include <soc.h>
 #include <errno.h>
 #include <i2c.h>
 #include "i2c_ll_stm32.h"
diff --git a/drivers/i2c/i2c_ll_stm32_v2.c b/drivers/i2c/i2c_ll_stm32_v2.c
index 501538f7c8a..a01acd8b788 100644
--- a/drivers/i2c/i2c_ll_stm32_v2.c
+++ b/drivers/i2c/i2c_ll_stm32_v2.c
@@ -12,7 +12,7 @@
 #include <clock_control.h>
 #include <misc/util.h>
 #include <kernel.h>
-#include <board.h>
+#include <soc.h>
 #include <errno.h>
 #include <i2c.h>
 #include "i2c_ll_stm32.h"
diff --git a/drivers/i2c/i2c_qmsi_ss.c b/drivers/i2c/i2c_qmsi_ss.c
index f794582a8d4..73ad1465486 100644
--- a/drivers/i2c/i2c_qmsi_ss.c
+++ b/drivers/i2c/i2c_qmsi_ss.c
@@ -7,7 +7,7 @@
 #include <errno.h>
 #include <device.h>
 #include <i2c.h>
-#include <board.h>
+#include <soc.h>
 
 #include "qm_ss_i2c.h"
 #include "qm_ss_isr.h"
diff --git a/drivers/i2c/i2c_sbcon.c b/drivers/i2c/i2c_sbcon.c
index e773e4eb224..02511c99622 100644
--- a/drivers/i2c/i2c_sbcon.c
+++ b/drivers/i2c/i2c_sbcon.c
@@ -12,7 +12,6 @@
  * hardware state of two-bit serial interfaces like I2C.
  */
 
-#include <board.h>
 #include <device.h>
 #include <errno.h>
 #include <i2c.h>
diff --git a/drivers/ieee802154/ieee802154_cc1200.c b/drivers/ieee802154/ieee802154_cc1200.c
index a17537d5028..a677107987a 100644
--- a/drivers/ieee802154/ieee802154_cc1200.c
+++ b/drivers/ieee802154/ieee802154_cc1200.c
@@ -17,7 +17,6 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <kernel.h>
 #include <arch/cpu.h>
 
-#include <board.h>
 #include <device.h>
 #include <init.h>
 #include <net/net_if.h>
diff --git a/drivers/ieee802154/ieee802154_cc2520.c b/drivers/ieee802154/ieee802154_cc2520.c
index 1a0169931d3..af69b5c5a53 100644
--- a/drivers/ieee802154/ieee802154_cc2520.c
+++ b/drivers/ieee802154/ieee802154_cc2520.c
@@ -17,7 +17,6 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <kernel.h>
 #include <arch/cpu.h>
 
-#include <board.h>
 #include <device.h>
 #include <init.h>
 #include <net/net_if.h>
diff --git a/drivers/ieee802154/ieee802154_kw41z.c b/drivers/ieee802154/ieee802154_kw41z.c
index 48b501f3cc7..c932272f3bc 100644
--- a/drivers/ieee802154/ieee802154_kw41z.c
+++ b/drivers/ieee802154/ieee802154_kw41z.c
@@ -14,7 +14,6 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <zephyr.h>
 #include <kernel.h>
-#include <board.h>
 #include <device.h>
 #include <init.h>
 #include <irq.h>
diff --git a/drivers/ieee802154/ieee802154_mcr20a.c b/drivers/ieee802154/ieee802154_mcr20a.c
index cfd856ce77e..2de51f57cde 100644
--- a/drivers/ieee802154/ieee802154_mcr20a.c
+++ b/drivers/ieee802154/ieee802154_mcr20a.c
@@ -17,7 +17,6 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <kernel.h>
 #include <arch/cpu.h>
 
-#include <board.h>
 #include <device.h>
 #include <init.h>
 #include <net/net_if.h>
diff --git a/drivers/ieee802154/ieee802154_nrf5.c b/drivers/ieee802154/ieee802154_nrf5.c
index dc6b97d565c..90e3913806b 100644
--- a/drivers/ieee802154/ieee802154_nrf5.c
+++ b/drivers/ieee802154/ieee802154_nrf5.c
@@ -17,7 +17,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <kernel.h>
 #include <arch/cpu.h>
 
-#include <board.h>
+#include <soc.h>
 #include <device.h>
 #include <init.h>
 #include <net/net_if.h>
diff --git a/drivers/ieee802154/ieee802154_uart_pipe.c b/drivers/ieee802154/ieee802154_uart_pipe.c
index 22c380fe6f9..402ae0a0eb8 100644
--- a/drivers/ieee802154/ieee802154_uart_pipe.c
+++ b/drivers/ieee802154/ieee802154_uart_pipe.c
@@ -15,7 +15,6 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <kernel.h>
 #include <arch/cpu.h>
 
-#include <board.h>
 #include <device.h>
 #include <init.h>
 #include <net/net_if.h>
diff --git a/drivers/interrupt_controller/arcv2_irq_unit.c b/drivers/interrupt_controller/arcv2_irq_unit.c
index 71915590ab3..2663b9a7df8 100644
--- a/drivers/interrupt_controller/arcv2_irq_unit.c
+++ b/drivers/interrupt_controller/arcv2_irq_unit.c
@@ -17,7 +17,6 @@
 
 #include <kernel.h>
 #include <arch/cpu.h>
-#include <board.h>
 #include <device.h>
 #include <init.h>
 
diff --git a/drivers/interrupt_controller/cavs_ictl.c b/drivers/interrupt_controller/cavs_ictl.c
index 3fbefef51c2..c521ce4eb73 100644
--- a/drivers/interrupt_controller/cavs_ictl.c
+++ b/drivers/interrupt_controller/cavs_ictl.c
@@ -5,7 +5,6 @@
  */
 
 #include <device.h>
-#include <board.h>
 #include <irq_nextlevel.h>
 #include "cavs_ictl.h"
 
diff --git a/drivers/interrupt_controller/dw_ictl.c b/drivers/interrupt_controller/dw_ictl.c
index f80fe058f19..f3f2795ed8c 100644
--- a/drivers/interrupt_controller/dw_ictl.c
+++ b/drivers/interrupt_controller/dw_ictl.c
@@ -12,7 +12,6 @@
  */
 
 #include <device.h>
-#include <board.h>
 #include <irq_nextlevel.h>
 #include "dw_ictl.h"
 
diff --git a/drivers/interrupt_controller/i8259.c b/drivers/interrupt_controller/i8259.c
index 5b5e4248c09..75f10eae787 100644
--- a/drivers/interrupt_controller/i8259.c
+++ b/drivers/interrupt_controller/i8259.c
@@ -20,8 +20,6 @@
 #include <device.h>
 #include <init.h>
 
-#include <board.h>
-
 /* programmable interrupt controller info (pair of cascaded 8259A devices) */
 #define PIC_MASTER_BASE_ADRS 0x20
 #define PIC_SLAVE_BASE_ADRS 0xa0
diff --git a/drivers/interrupt_controller/ioapic_intr.c b/drivers/interrupt_controller/ioapic_intr.c
index 713d10e3e61..1249fe06feb 100644
--- a/drivers/interrupt_controller/ioapic_intr.c
+++ b/drivers/interrupt_controller/ioapic_intr.c
@@ -53,8 +53,6 @@
 #include <kernel.h>
 #include <arch/cpu.h>
 
-#include "board.h"
-
 #include <toolchain.h>
 #include <linker/sections.h>
 #include <init.h>
diff --git a/drivers/interrupt_controller/loapic_intr.c b/drivers/interrupt_controller/loapic_intr.c
index b99d5d2fcd3..5f61e7d6d43 100644
--- a/drivers/interrupt_controller/loapic_intr.c
+++ b/drivers/interrupt_controller/loapic_intr.c
@@ -84,7 +84,6 @@
 #include <string.h>
 #include <misc/__assert.h>
 
-#include "board.h"
 #include <toolchain.h>
 #include <linker/sections.h>
 #include <drivers/loapic.h> /* public API declarations */
diff --git a/drivers/interrupt_controller/shared_irq.c b/drivers/interrupt_controller/shared_irq.c
index f52817edd41..f18ba38e3ea 100644
--- a/drivers/interrupt_controller/shared_irq.c
+++ b/drivers/interrupt_controller/shared_irq.c
@@ -10,7 +10,6 @@
 #include <device.h>
 #include <shared_irq.h>
 #include <init.h>
-#include <board.h>
 #include <sys_io.h>
 
 #ifdef CONFIG_IOAPIC
diff --git a/drivers/interrupt_controller/system_apic.c b/drivers/interrupt_controller/system_apic.c
index 54743fe3a87..927980cdb08 100644
--- a/drivers/interrupt_controller/system_apic.c
+++ b/drivers/interrupt_controller/system_apic.c
@@ -11,7 +11,6 @@
  */
 
 #include <misc/__assert.h>
-#include "board.h"
 #include <kernel.h>
 #include <arch/cpu.h>
 #include <drivers/ioapic.h>
diff --git a/drivers/ipm/ipm_quark_se.h b/drivers/ipm/ipm_quark_se.h
index dfeef167ef7..ea084cc240e 100644
--- a/drivers/ipm/ipm_quark_se.h
+++ b/drivers/ipm/ipm_quark_se.h
@@ -11,7 +11,7 @@
 #define ZEPHYR_DRIVERS_IPM_IPM_QUARK_SE_H_
 
 #include <kernel.h>
-#include <board.h> /* for SCSS_REGISTER_BASE */
+#include <soc.h> /* for SCSS_REGISTER_BASE */
 #include <ipm.h>
 #include <device.h>
 #include <init.h>
diff --git a/drivers/led_strip/ws2812b_sw.c b/drivers/led_strip/ws2812b_sw.c
index c1b8bbffad3..f7a13a17a61 100644
--- a/drivers/led_strip/ws2812b_sw.c
+++ b/drivers/led_strip/ws2812b_sw.c
@@ -13,7 +13,7 @@
 LOG_MODULE_REGISTER(ws2812b_sw);
 
 #include <zephyr.h>
-#include <board.h>
+#include <soc.h>
 #include <gpio.h>
 #include <device.h>
 #include <clock_control.h>
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 91d3c75341c..0cdeb4d9097 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -75,7 +75,7 @@
 #include <toolchain.h>
 #include <linker/sections.h>
 
-#include <board.h>
+#include <soc.h>
 
 #include <pci/pci_mgr.h>
 #include <pci/pci.h>
diff --git a/drivers/pci/pci_interface.c b/drivers/pci/pci_interface.c
index 06a941105b8..83d50f5274a 100644
--- a/drivers/pci/pci_interface.c
+++ b/drivers/pci/pci_interface.c
@@ -17,7 +17,7 @@
 
 #include <pci/pci_mgr.h>
 #include <string.h>
-#include <board.h>
+#include <soc.h>
 
 #if (PCI_CTRL_ADDR_REG == 0)
 #error "PCI_CTRL_ADDR_REG cannot be zero"
diff --git a/drivers/pci/pci_legacy_bridge.c b/drivers/pci/pci_legacy_bridge.c
index 4ffcb0458ad..0411b7657c0 100644
--- a/drivers/pci/pci_legacy_bridge.c
+++ b/drivers/pci/pci_legacy_bridge.c
@@ -17,7 +17,7 @@
 
 #include <drivers/pci/pci_mgr.h>
 #include <drivers/pci/pci.h>
-#include <board.h>
+#include <soc.h>
 
 #define PCI_LEGACY_BRIDGE_REG (0xF0 / 4) /* RCBA offset in 32-bit words */
 #define PCI_ADDR_IRQAGENT0 0x3140
diff --git a/drivers/pinmux/dev/pinmux_dev_arm_beetle.c b/drivers/pinmux/dev/pinmux_dev_arm_beetle.c
index 8c3f6bf6146..135be74505c 100644
--- a/drivers/pinmux/dev/pinmux_dev_arm_beetle.c
+++ b/drivers/pinmux/dev/pinmux_dev_arm_beetle.c
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <kernel.h>
-#include <board.h>
 
 #include <device.h>
 #include <errno.h>
diff --git a/drivers/pinmux/dev/pinmux_dev_atmel_sam3x.c b/drivers/pinmux/dev/pinmux_dev_atmel_sam3x.c
index a532728d7c3..b1ed571d569 100644
--- a/drivers/pinmux/dev/pinmux_dev_atmel_sam3x.c
+++ b/drivers/pinmux/dev/pinmux_dev_atmel_sam3x.c
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <kernel.h>
-#include <board.h>
 
 #include <device.h>
 #include <errno.h>
diff --git a/drivers/pwm/pwm_dw.c b/drivers/pwm/pwm_dw.c
index 2d067ad4220..801a191ef9a 100644
--- a/drivers/pwm/pwm_dw.c
+++ b/drivers/pwm/pwm_dw.c
@@ -20,7 +20,6 @@
 #include <errno.h>
 
 #include <kernel.h>
-#include <board.h>
 #include <pwm.h>
 
 /* Register for component version */
diff --git a/drivers/pwm/pwm_led_esp32.c b/drivers/pwm/pwm_led_esp32.c
index d3e38244afd..eae82935f81 100644
--- a/drivers/pwm/pwm_led_esp32.c
+++ b/drivers/pwm/pwm_led_esp32.c
@@ -13,7 +13,6 @@
 
 #include <soc.h>
 #include <errno.h>
-#include <board.h>
 #include <pwm.h>
 #include <kernel.h>
 #include <gpio.h>
diff --git a/drivers/pwm/pwm_stm32.c b/drivers/pwm/pwm_stm32.c
index 8b478961d5f..5eff169b154 100644
--- a/drivers/pwm/pwm_stm32.c
+++ b/drivers/pwm/pwm_stm32.c
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 
-#include <board.h>
+#include <soc.h>
 #include <pwm.h>
 #include <device.h>
 #include <kernel.h>
diff --git a/drivers/rtc/rtc_ll_stm32.c b/drivers/rtc/rtc_ll_stm32.c
index 257f43089b9..5d5e533a5cf 100644
--- a/drivers/rtc/rtc_ll_stm32.c
+++ b/drivers/rtc/rtc_ll_stm32.c
@@ -14,7 +14,7 @@
 #include <clock_control.h>
 #include <misc/util.h>
 #include <kernel.h>
-#include <board.h>
+#include <soc.h>
 #include <rtc.h>
 
 #if defined(CONFIG_SOC_SERIES_STM32L4X)
diff --git a/drivers/serial/leuart_gecko.c b/drivers/serial/leuart_gecko.c
index baa8af272d7..50a16491994 100644
--- a/drivers/serial/leuart_gecko.c
+++ b/drivers/serial/leuart_gecko.c
@@ -9,7 +9,7 @@
 #include <em_leuart.h>
 #include <em_gpio.h>
 #include <em_cmu.h>
-#include <board.h>
+#include <soc.h>
 
 #define DEV_CFG(dev) \
 	((const struct leuart_gecko_config * const)(dev)->config->config_info)
diff --git a/drivers/serial/uart_cmsdk_apb.c b/drivers/serial/uart_cmsdk_apb.c
index 2782e5eaa55..3c3eb04ffbc 100644
--- a/drivers/serial/uart_cmsdk_apb.c
+++ b/drivers/serial/uart_cmsdk_apb.c
@@ -14,7 +14,6 @@
 #include <arch/cpu.h>
 #include <clock_control/arm_clock_control.h>
 #include <misc/__assert.h>
-#include <board.h>
 #include <init.h>
 #include <uart.h>
 #include <linker/sections.h>
diff --git a/drivers/serial/uart_imx.c b/drivers/serial/uart_imx.c
index a8d60a551f8..a26c71a4292 100644
--- a/drivers/serial/uart_imx.c
+++ b/drivers/serial/uart_imx.c
@@ -15,7 +15,7 @@
 #include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/__assert.h>
-#include <board.h>
+#include <soc.h>
 #include <init.h>
 #include <uart.h>
 #include <uart_imx.h>
diff --git a/drivers/serial/uart_ns16550.c b/drivers/serial/uart_ns16550.c
index b0559d40bb4..0e5a5139405 100644
--- a/drivers/serial/uart_ns16550.c
+++ b/drivers/serial/uart_ns16550.c
@@ -27,7 +27,6 @@
 #include <zephyr/types.h>
 #include <soc.h>
 
-#include <board.h>
 #include <init.h>
 #include <toolchain.h>
 #include <linker/sections.h>
diff --git a/drivers/serial/uart_nsim.c b/drivers/serial/uart_nsim.c
index d06efa1b5d6..a57a09361ed 100644
--- a/drivers/serial/uart_nsim.c
+++ b/drivers/serial/uart_nsim.c
@@ -13,7 +13,6 @@
 #include <zephyr/types.h>
 #include <misc/util.h>
 #include <string.h>
-#include <board.h>
 #include <init.h>
 #include <uart.h>
 
diff --git a/drivers/serial/uart_psoc6.c b/drivers/serial/uart_psoc6.c
index 6197f39bb75..58cbb4184e7 100644
--- a/drivers/serial/uart_psoc6.c
+++ b/drivers/serial/uart_psoc6.c
@@ -16,7 +16,6 @@
 #include <misc/__assert.h>
 #include <soc.h>
 #include <uart.h>
-#include <board.h>
 
 #include "cy_syslib.h"
 #include "cy_sysclk.h"
diff --git a/drivers/serial/uart_sifive.c b/drivers/serial/uart_sifive.c
index d4026bec034..4988c996830 100644
--- a/drivers/serial/uart_sifive.c
+++ b/drivers/serial/uart_sifive.c
@@ -11,7 +11,6 @@
 #include <kernel.h>
 #include <arch/cpu.h>
 #include <uart.h>
-#include <board.h>
 
 #define RXDATA_EMPTY   (1 << 31)   /* Receive FIFO Empty */
 #define RXDATA_MASK    0xFF        /* Receive Data Mask */
diff --git a/drivers/serial/uart_stellaris.c b/drivers/serial/uart_stellaris.c
index 0e3e850b7b1..1ed00f38763 100644
--- a/drivers/serial/uart_stellaris.c
+++ b/drivers/serial/uart_stellaris.c
@@ -21,7 +21,7 @@
 #include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/__assert.h>
-#include <board.h>
+#include <soc.h>
 #include <init.h>
 #include <uart.h>
 #include <linker/sections.h>
diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c
index a12ca080d1b..01ae2fed145 100644
--- a/drivers/serial/uart_stm32.c
+++ b/drivers/serial/uart_stm32.c
@@ -13,7 +13,7 @@
 #include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/__assert.h>
-#include <board.h>
+#include <soc.h>
 #include <init.h>
 #include <uart.h>
 #include <clock_control.h>
diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
index 4470b6babd8..f6702166979 100644
--- a/drivers/spi/spi_dw.c
+++ b/drivers/spi/spi_dw.c
@@ -28,7 +28,7 @@ LOG_MODULE_REGISTER(spi_dw);
 #include <kernel.h>
 #include <arch/cpu.h>
 
-#include <board.h>
+#include <soc.h>
 #include <device.h>
 #include <init.h>
 
diff --git a/drivers/spi/spi_intel.c b/drivers/spi/spi_intel.c
index 57b6d1ee3a4..ddf8c0a1918 100644
--- a/drivers/spi/spi_intel.c
+++ b/drivers/spi/spi_intel.c
@@ -17,7 +17,7 @@ LOG_MODULE_REGISTER(spi_intel);
 #include <arch/cpu.h>
 
 #include <misc/__assert.h>
-#include <board.h>
+#include <soc.h>
 #include <init.h>
 
 #include <sys_io.h>
diff --git a/drivers/spi/spi_ll_stm32.c b/drivers/spi/spi_ll_stm32.c
index ed7fda9f5f7..8290297f6c8 100644
--- a/drivers/spi/spi_ll_stm32.c
+++ b/drivers/spi/spi_ll_stm32.c
@@ -10,7 +10,7 @@ LOG_MODULE_REGISTER(spi_ll_stm32);
 
 #include <misc/util.h>
 #include <kernel.h>
-#include <board.h>
+#include <soc.h>
 #include <errno.h>
 #include <spi.h>
 #include <toolchain.h>
diff --git a/drivers/timer/arcv2_timer0.c b/drivers/timer/arcv2_timer0.c
index 4282a37478e..609e8d21499 100644
--- a/drivers/timer/arcv2_timer0.c
+++ b/drivers/timer/arcv2_timer0.c
@@ -57,7 +57,7 @@
  * to build the ARC CPU with Timer0.
  */
 
-#include <board.h>
+#include <soc.h>
 
 #include "legacy_api.h"
 
diff --git a/drivers/timer/cortex_m_systick.c b/drivers/timer/cortex_m_systick.c
index a30c0ea3979..0eb81f42f00 100644
--- a/drivers/timer/cortex_m_systick.c
+++ b/drivers/timer/cortex_m_systick.c
@@ -40,8 +40,6 @@ static volatile u32_t clock_accumulated_count;
  * This is the sysTick input clock frequency.
  */
 
-#include <board.h>
-
 #include "legacy_api.h"
 
 #ifdef CONFIG_TICKLESS_IDLE
diff --git a/drivers/timer/hpet.c b/drivers/timer/hpet.c
index ea5d0c710b0..043bb31122d 100644
--- a/drivers/timer/hpet.c
+++ b/drivers/timer/hpet.c
@@ -49,8 +49,6 @@
 #include <drivers/system_timer.h>
 #include <kernel_structs.h>
 
-#include <board.h>
-
 #include "legacy_api.h"
 
 /* HPET register offsets */
diff --git a/drivers/timer/loapic_timer.c b/drivers/timer/loapic_timer.c
index ffc7f0d0d7f..5507fe81d2d 100644
--- a/drivers/timer/loapic_timer.c
+++ b/drivers/timer/loapic_timer.c
@@ -73,7 +73,6 @@
 #include <arch/x86/irq_controller.h>
 #include <power.h>
 #include <device.h>
-#include <board.h>
 #include <kernel_structs.h>
 
 #include "legacy_api.h"
diff --git a/drivers/timer/pulpino_timer.c b/drivers/timer/pulpino_timer.c
index 513479279ba..dec242c6a74 100644
--- a/drivers/timer/pulpino_timer.c
+++ b/drivers/timer/pulpino_timer.c
@@ -8,7 +8,6 @@
 #include <arch/cpu.h>
 #include <device.h>
 #include <system_timer.h>
-#include <board.h>
 
 /* Timer Ctrl Bitfields */
 #define TIMER_CTRL_EN              (1 << 0)            /* Timer Enable Bit */
diff --git a/drivers/timer/riscv_machine_timer.c b/drivers/timer/riscv_machine_timer.c
index de3392e5065..39a85db9d14 100644
--- a/drivers/timer/riscv_machine_timer.c
+++ b/drivers/timer/riscv_machine_timer.c
@@ -8,7 +8,6 @@
 #include <arch/cpu.h>
 #include <device.h>
 #include <system_timer.h>
-#include <board.h>
 
 #include "legacy_api.h"
 
diff --git a/drivers/usb/device/usb_dc_kinetis.c b/drivers/usb/device/usb_dc_kinetis.c
index 4ce74f1fc3b..458ca094159 100644
--- a/drivers/usb/device/usb_dc_kinetis.c
+++ b/drivers/usb/device/usb_dc_kinetis.c
@@ -12,7 +12,6 @@
 #include <kernel.h>
 #include <misc/byteorder.h>
 #include <usb/usb_device.h>
-#include <board.h>
 #include <device.h>
 
 #define LOG_LEVEL CONFIG_USB_DRIVER_LOG_LEVEL
diff --git a/drivers/usb/device/usb_dw_registers.h b/drivers/usb/device/usb_dw_registers.h
index c58965de59a..f6584b5a6ff 100644
--- a/drivers/usb/device/usb_dw_registers.h
+++ b/drivers/usb/device/usb_dw_registers.h
@@ -16,7 +16,6 @@
 #define ZEPHYR_DRIVERS_USB_DEVICE_USB_DW_REGISTERS_H_
 
 #include <misc/util.h>
-#include <board.h>
 
 #if defined(CONFIG_SOC_QUARK_SE_C1000)
 #include "qm_soc_regs.h"
diff --git a/drivers/wifi/winc1500/wifi_winc1500_nm_bsp.c b/drivers/wifi/winc1500/wifi_winc1500_nm_bsp.c
index df5065308d8..432d2ad8e11 100644
--- a/drivers/wifi/winc1500/wifi_winc1500_nm_bsp.c
+++ b/drivers/wifi/winc1500/wifi_winc1500_nm_bsp.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <board.h>
-
 #include "wifi_winc1500_nm_bsp_internal.h"
 
 #include <bsp/include/nm_bsp.h>
diff --git a/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c b/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c
index 0b0757fac9f..431705ce858 100644
--- a/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c
+++ b/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c
@@ -11,7 +11,6 @@ LOG_MODULE_REGISTER(winc1500);
 #include <stdio.h>
 #include <stdint.h>
 
-#include <board.h>
 #include <device.h>
 #include <spi.h>