From 148f4e3872db03f37e6cc1f235cca612d63ad71a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= <andrzej.glabek@nordicsemi.no>
Date: Wed, 16 Jan 2019 14:51:31 +0100
Subject: [PATCH] dts: nrf9160: Add rtc0 node and replace nvmc node with alias
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add missing node for instance 0 of the RTC peripheral and use an alias
to the flash-controller node instead of the nvmc node definition (there
is no need to have a separate node just to get the NVMC base address).

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
---
 dts/arm/nordic/nrf9160.dtsi        |  3 ++-
 dts/arm/nordic/nrf9160_common.dtsi | 14 +++++++-------
 dts/arm/nordic/nrf9160ns.dtsi      |  3 ++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dts/arm/nordic/nrf9160.dtsi b/dts/arm/nordic/nrf9160.dtsi
index 701b5d1ed67..c37b59404aa 100644
--- a/dts/arm/nordic/nrf9160.dtsi
+++ b/dts/arm/nordic/nrf9160.dtsi
@@ -28,10 +28,11 @@
 	aliases {
 		flash-controller = &flash_controller;
 		ficr = &ficr;
+		rtc-0 = &rtc0;
 		rtc-1 = &rtc1;
 		clock = &clock;
 		power = &power;
-		nvmc = &nvmc;
+		nvmc = &flash_controller;
 		spu = &spu;
 		uart-0 = &uart0;
 		uart-1 = &uart1;
diff --git a/dts/arm/nordic/nrf9160_common.dtsi b/dts/arm/nordic/nrf9160_common.dtsi
index 47edcb13c16..094c10e11e8 100644
--- a/dts/arm/nordic/nrf9160_common.dtsi
+++ b/dts/arm/nordic/nrf9160_common.dtsi
@@ -21,13 +21,6 @@ flash_controller: flash-controller@39000 {
 	};
 };
 
-nvmc: nvmc@39000 {
-	compatible = "nordic,nrf-nvmc";
-	reg = <0x39000 0x1000>;
-	status = "ok";
-	label = "NVMC";
-};
-
 adc: adc@e000 {
 	compatible = "nordic,nrf-saadc";
 	reg = <0xe000 0x1000>;
@@ -161,6 +154,13 @@ gpio0: gpio@842500 {
 	status = "disabled";
 };
 
+rtc0: rtc@14000 {
+	compatible = "nordic,nrf-rtc";
+	reg = <0x14000 0x1000>;
+	interrupts = <20 1>;
+	status = "ok";
+};
+
 rtc1: rtc@15000 {
 	compatible = "nordic,nrf-rtc";
 	reg = <0x15000 0x1000>;
diff --git a/dts/arm/nordic/nrf9160ns.dtsi b/dts/arm/nordic/nrf9160ns.dtsi
index f9f1566a590..9c8e0797662 100644
--- a/dts/arm/nordic/nrf9160ns.dtsi
+++ b/dts/arm/nordic/nrf9160ns.dtsi
@@ -26,10 +26,11 @@
 	};
 
 	aliases {
+		rtc-0 = &rtc0;
 		rtc-1 = &rtc1;
 		clock = &clock;
 		power = &power;
-		nvmc = &nvmc;
+		nvmc = &flash_controller;
 		uart-0 = &uart0;
 		uart-1 = &uart1;
 		uart-2 = &uart2;