From c24c463328c16b55974636a727758dd96c076d34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Thu, 19 Sep 2019 13:34:17 +0200
Subject: [PATCH] soc: nordic: Include <nrfx.h> instead of <nrf.h> from <soc.h>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change is done so that there is no need to additionaly include
<nrfx.h> before <soc/nrfx_coredep.h> (what might be a bit surprising)
and so that <nrfx_config.h> doesn't need to be include separately for
nRF SoCs requiring a special mapping of peripheral accessing symbols.

This commit removes also no longer needed inclusions and updates
the hal_nordic module with required minor correction of nrfx_glue.h.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 drivers/sensor/nrf5/temp_nrf5.c                | 2 --
 samples/boards/nrf52/mesh/onoff-app/src/main.c | 1 -
 soc/arm/nordic_nrf/nrf51/soc.c                 | 1 -
 soc/arm/nordic_nrf/nrf51/soc.h                 | 2 +-
 soc/arm/nordic_nrf/nrf52/soc.c                 | 1 -
 soc/arm/nordic_nrf/nrf52/soc.h                 | 2 +-
 soc/arm/nordic_nrf/nrf91/soc.c                 | 1 -
 soc/arm/nordic_nrf/nrf91/soc.h                 | 5 +----
 west.yml                                       | 2 +-
 9 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/drivers/sensor/nrf5/temp_nrf5.c b/drivers/sensor/nrf5/temp_nrf5.c
index 3e1784ad92f..b4f210ba4c7 100644
--- a/drivers/sensor/nrf5/temp_nrf5.c
+++ b/drivers/sensor/nrf5/temp_nrf5.c
@@ -13,8 +13,6 @@
 
 LOG_MODULE_REGISTER(temp_nrf5, CONFIG_SENSOR_LOG_LEVEL);
 
-#include "nrf.h"
-
 
 /* The nRF5 temperature device returns measurements in 0.25C
  * increments.  Scale to mDegrees C.
diff --git a/samples/boards/nrf52/mesh/onoff-app/src/main.c b/samples/boards/nrf52/mesh/onoff-app/src/main.c
index 54575931140..34fbe812f3d 100644
--- a/samples/boards/nrf52/mesh/onoff-app/src/main.c
+++ b/samples/boards/nrf52/mesh/onoff-app/src/main.c
@@ -39,7 +39,6 @@
 #include <sys/printk.h>
 #include <settings/settings.h>
 #include <sys/byteorder.h>
-#include <nrf.h>
 #include <device.h>
 #include <drivers/gpio.h>
 #include <bluetooth/bluetooth.h>
diff --git a/soc/arm/nordic_nrf/nrf51/soc.c b/soc/arm/nordic_nrf/nrf51/soc.c
index d9e819b67f7..cc03145f5f4 100644
--- a/soc/arm/nordic_nrf/nrf51/soc.c
+++ b/soc/arm/nordic_nrf/nrf51/soc.c
@@ -15,7 +15,6 @@
 
 #include <kernel.h>
 #include <init.h>
-#include <nrfx.h>
 #include <hal/nrf_power.h>
 #include <soc/nrfx_coredep.h>
 #include <logging/log.h>
diff --git a/soc/arm/nordic_nrf/nrf51/soc.h b/soc/arm/nordic_nrf/nrf51/soc.h
index eded6e6f13d..8b73946eb16 100644
--- a/soc/arm/nordic_nrf/nrf51/soc.h
+++ b/soc/arm/nordic_nrf/nrf51/soc.h
@@ -14,7 +14,7 @@
 #ifndef _ASMLANGUAGE
 
 #include <nrf_common.h>
-#include <nrf.h>
+#include <nrfx.h>
 
 /* Add include for DTS generated information */
 #include <generated_dts_board.h>
diff --git a/soc/arm/nordic_nrf/nrf52/soc.c b/soc/arm/nordic_nrf/nrf52/soc.c
index 4245806f43e..76bf8f9a3de 100644
--- a/soc/arm/nordic_nrf/nrf52/soc.c
+++ b/soc/arm/nordic_nrf/nrf52/soc.c
@@ -15,7 +15,6 @@
 #include <kernel.h>
 #include <init.h>
 #include <cortex_m/exc.h>
-#include <nrfx.h>
 #include <hal/nrf_power.h>
 #include <soc/nrfx_coredep.h>
 #include <logging/log.h>
diff --git a/soc/arm/nordic_nrf/nrf52/soc.h b/soc/arm/nordic_nrf/nrf52/soc.h
index 00ee8107e0e..0e753e3bb5e 100644
--- a/soc/arm/nordic_nrf/nrf52/soc.h
+++ b/soc/arm/nordic_nrf/nrf52/soc.h
@@ -14,7 +14,7 @@
 #ifndef _ASMLANGUAGE
 
 #include <nrf_common.h>
-#include <nrf.h>
+#include <nrfx.h>
 
 /* Add include for DTS generated information */
 #include <generated_dts_board.h>
diff --git a/soc/arm/nordic_nrf/nrf91/soc.c b/soc/arm/nordic_nrf/nrf91/soc.c
index 7d10fcd0018..e406eb7fed5 100644
--- a/soc/arm/nordic_nrf/nrf91/soc.c
+++ b/soc/arm/nordic_nrf/nrf91/soc.c
@@ -15,7 +15,6 @@
 #include <kernel.h>
 #include <init.h>
 #include <cortex_m/exc.h>
-#include <nrfx.h>
 #include <soc/nrfx_coredep.h>
 #include <logging/log.h>
 
diff --git a/soc/arm/nordic_nrf/nrf91/soc.h b/soc/arm/nordic_nrf/nrf91/soc.h
index 2fc4cb556c4..592890ac394 100644
--- a/soc/arm/nordic_nrf/nrf91/soc.h
+++ b/soc/arm/nordic_nrf/nrf91/soc.h
@@ -13,14 +13,11 @@
 
 #ifndef _ASMLANGUAGE
 
-#include <nrf.h>
+#include <nrfx.h>
 
 /* Add include for DTS generated information */
 #include <generated_dts_board.h>
 
-/* Add include for peripheral base address mappings */
-#include <nrfx_config.h>
-
 #endif /* !_ASMLANGUAGE */
 
 #define FLASH_PAGE_ERASE_MAX_TIME_US 	89700UL
diff --git a/west.yml b/west.yml
index d257d7416fc..52409e760ef 100644
--- a/west.yml
+++ b/west.yml
@@ -44,7 +44,7 @@ manifest:
       revision: a12d92816a53a521d79cefcf5c38b9dc8a4fed6e
       path: modules/hal/cypress
     - name: hal_nordic
-      revision: 6a4181a794e71fbf6e9a7c857aaff8e2e7a9602f
+      revision: db6277a1266cbcbd5588959bbacc1cd5670aed0e
       path: modules/hal/nordic
     - name: hal_openisa
       revision: be5c01f86c96500def5079bcc58d2baefdffb6c8