From ad0e041e3d61565bd2eb09a3459f66fd05c4515e Mon Sep 17 00:00:00 2001
From: Vinayak Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
Date: Mon, 15 Aug 2016 11:36:57 +0200
Subject: [PATCH] soc: Use nrf.h instead of nrf52.h and nrf52_bitfields.h

Since nrf.h abstracts the differences between the nRF51 and nRF52
architectures and chooses the right headers to include, it is
safer to use that instead of directly including the soc-specific
headers.

Jira: ZEP-702

Change-Id: I0e1758ede48f3422a41d226b0eab008e4ba2c77c
Signed-off-by: Vinayak Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
---
 arch/arm/soc/nordic_nrf5/nrf52/soc.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/soc/nordic_nrf5/nrf52/soc.h b/arch/arm/soc/nordic_nrf5/nrf52/soc.h
index 4775fe20f44..f4fb267162d 100644
--- a/arch/arm/soc/nordic_nrf5/nrf52/soc.h
+++ b/arch/arm/soc/nordic_nrf5/nrf52/soc.h
@@ -24,8 +24,7 @@
 #ifndef _ASMLANGUAGE
 
 #include "soc_irq.h"
-#include <nrf52.h>
-#include <nrf52_bitfields.h>
+#include <nrf.h>
 #include <device.h>
 #include <misc/util.h>
 #include <drivers/rand32.h>