michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: nrf9160: Add rtc0 node and replace nvmc node with alias

Browse source 
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>
This commit is contained in:
Andrzej Głąbek 2019-01-16 14:51:31 +01:00 • committed by Carles Cufí
commit 148f4e3872
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dts/arm/nordic/nrf9160.dtsi
View file

@ -28,10 +28,11 @@
aliases { aliases {
flash-controller = &flash_controller; flash-controller = &flash_controller;
ficr = &ficr; ficr = &ficr;
rtc-0 = &rtc0;
rtc-1 = &rtc1; rtc-1 = &rtc1;
clock = &clock; clock = &clock;
power = &power; power = &power;
nvmc = &nvmc; nvmc = &flash_controller;
spu = &spu; spu = &spu;
uart-0 = &uart0; uart-0 = &uart0;
uart-1 = &uart1; uart-1 = &uart1;

14
dts/arm/nordic/nrf9160_common.dtsi
View file

@ -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 { adc: adc@e000 {
compatible = "nordic,nrf-saadc"; compatible = "nordic,nrf-saadc";
reg = <0xe000 0x1000>; reg = <0xe000 0x1000>;
@ -161,6 +154,13 @@ gpio0: gpio@842500 {
status = "disabled"; status = "disabled";
}; };
rtc0: rtc@14000 {
compatible = "nordic,nrf-rtc";
reg = <0x14000 0x1000>;
interrupts = <20 1>;
status = "ok";
};
rtc1: rtc@15000 { rtc1: rtc@15000 {
compatible = "nordic,nrf-rtc"; compatible = "nordic,nrf-rtc";
reg = <0x15000 0x1000>; reg = <0x15000 0x1000>;

3
dts/arm/nordic/nrf9160ns.dtsi
View file

@ -26,10 +26,11 @@
}; };
aliases { aliases {
rtc-0 = &rtc0;
rtc-1 = &rtc1; rtc-1 = &rtc1;
clock = &clock; clock = &clock;
power = &power; power = &power;
nvmc = &nvmc; nvmc = &flash_controller;
uart-0 = &uart0; uart-0 = &uart0;
uart-1 = &uart1; uart-1 = &uart1;
uart-2 = &uart2; uart-2 = &uart2;