diff --git a/dts/arm/nordic/nrf51822.dtsi b/dts/arm/nordic/nrf51822.dtsi index 8fef8739cc4..d6f22e8d050 100644 --- a/dts/arm/nordic/nrf51822.dtsi +++ b/dts/arm/nordic/nrf51822.dtsi @@ -17,28 +17,6 @@ }; }; - flash-controller@4001E000 { - compatible = "nordic,nrf51-flash-controller"; - reg = <0x4001E000 0x1000>; - - #address-cells = <1>; - #size-cells = <1>; - - label="NRF_FLASH_DRV_NAME"; - - flash0: flash@0 { - compatible = "soc-nv-flash"; - label = "NRF_FLASH"; - erase-block-size = <1024>; - write-block-size = <4>; - }; - }; - - sram0: memory@20000000 { - device_type = "memory"; - compatible = "mmio-sram"; - }; - aliases { i2c-0 = &i2c0; i2c-1 = &i2c1; @@ -58,6 +36,29 @@ }; soc { + + flash-controller@4001e000 { + compatible = "nordic,nrf51-flash-controller"; + reg = <0x4001e000 0x1000>; + + #address-cells = <1>; + #size-cells = <1>; + + label="NRF_FLASH_DRV_NAME"; + + flash0: flash@0 { + compatible = "soc-nv-flash"; + label = "NRF_FLASH"; + erase-block-size = <1024>; + write-block-size = <4>; + }; + }; + + sram0: memory@20000000 { + device_type = "memory"; + compatible = "mmio-sram"; + }; + adc: adc@40007000 { compatible = "nordic,nrf-adc"; reg = <0x40007000 0x1000>; diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi index f1788894a79..5c261477e29 100644 --- a/dts/arm/nordic/nrf52810.dtsi +++ b/dts/arm/nordic/nrf52810.dtsi @@ -17,27 +17,6 @@ }; }; - flash-controller@4001E000 { - compatible = "nordic,nrf52-flash-controller"; - reg = <0x4001E000 0x1000>; - - #address-cells = <1>; - #size-cells = <1>; - - label="NRF_FLASH_DRV_NAME"; - - flash0: flash@0 { - compatible = "soc-nv-flash"; - label = "NRF_FLASH"; - write-block-size = <4>; - }; - }; - - sram0: memory@20000000 { - device_type = "memory"; - compatible = "mmio-sram"; - }; - aliases { i2c-0 = &i2c0; spi-0 = &spi0; @@ -56,6 +35,28 @@ }; soc { + + flash-controller@4001e000 { + compatible = "nordic,nrf52-flash-controller"; + reg = <0x4001e000 0x1000>; + + #address-cells = <1>; + #size-cells = <1>; + + label="NRF_FLASH_DRV_NAME"; + + flash0: flash@0 { + compatible = "soc-nv-flash"; + label = "NRF_FLASH"; + write-block-size = <4>; + }; + }; + + sram0: memory@20000000 { + device_type = "memory"; + compatible = "mmio-sram"; + }; + adc: adc@40007000 { compatible = "nordic,nrf-saadc"; reg = <0x40007000 0x1000>; diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi index d5136ee8f2e..e7f5e587449 100644 --- a/dts/arm/nordic/nrf52811.dtsi +++ b/dts/arm/nordic/nrf52811.dtsi @@ -20,27 +20,6 @@ }; }; - flash-controller@4001E000 { - compatible = "nordic,nrf52-flash-controller"; - reg = <0x4001E000 0x1000>; - - #address-cells = <1>; - #size-cells = <1>; - - label="NRF_FLASH_DRV_NAME"; - - flash0: flash@0 { - compatible = "soc-nv-flash"; - label = "NRF_FLASH"; - write-block-size = <4>; - }; - }; - - sram0: memory@20000000 { - device_type = "memory"; - compatible = "mmio-sram"; - }; - aliases { i2c-0 = &i2c0; spi-0 = &spi0; @@ -60,6 +39,28 @@ }; soc { + + flash-controller@4001e000 { + compatible = "nordic,nrf52-flash-controller"; + reg = <0x4001e000 0x1000>; + + #address-cells = <1>; + #size-cells = <1>; + + label="NRF_FLASH_DRV_NAME"; + + flash0: flash@0 { + compatible = "soc-nv-flash"; + label = "NRF_FLASH"; + write-block-size = <4>; + }; + }; + + sram0: memory@20000000 { + device_type = "memory"; + compatible = "mmio-sram"; + }; + adc: adc@40007000 { compatible = "nordic,nrf-saadc"; reg = <0x40007000 0x1000>; diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi index 4b2b82e3c3b..bf6b33ec387 100644 --- a/dts/arm/nordic/nrf52832.dtsi +++ b/dts/arm/nordic/nrf52832.dtsi @@ -17,28 +17,6 @@ }; }; - flash-controller@4001E000 { - compatible = "nordic,nrf52-flash-controller"; - reg = <0x4001E000 0x1000>; - - #address-cells = <1>; - #size-cells = <1>; - - label="NRF_FLASH_DRV_NAME"; - - flash0: flash@0 { - compatible = "soc-nv-flash"; - label = "NRF_FLASH"; - erase-block-size = <4096>; - write-block-size = <4>; - }; - }; - - sram0: memory@20000000 { - device_type = "memory"; - compatible = "mmio-sram"; - }; - aliases { i2c-0 = &i2c0; i2c-1 = &i2c1; @@ -65,6 +43,29 @@ }; soc { + + flash-controller@4001e000 { + compatible = "nordic,nrf52-flash-controller"; + reg = <0x4001e000 0x1000>; + + #address-cells = <1>; + #size-cells = <1>; + + label="NRF_FLASH_DRV_NAME"; + + flash0: flash@0 { + compatible = "soc-nv-flash"; + label = "NRF_FLASH"; + erase-block-size = <4096>; + write-block-size = <4>; + }; + }; + + sram0: memory@20000000 { + device_type = "memory"; + compatible = "mmio-sram"; + }; + adc: adc@40007000 { compatible = "nordic,nrf-saadc"; reg = <0x40007000 0x1000>; diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi index e76cb52e030..a4f31e65b23 100644 --- a/dts/arm/nordic/nrf52840.dtsi +++ b/dts/arm/nordic/nrf52840.dtsi @@ -17,28 +17,6 @@ }; }; - flash-controller@4001E000 { - compatible = "nordic,nrf52-flash-controller"; - reg = <0x4001E000 0x1000>; - - #address-cells = <1>; - #size-cells = <1>; - - label="NRF_FLASH_DRV_NAME"; - - flash0: flash@0 { - compatible = "soc-nv-flash"; - label = "NRF_FLASH"; - erase-block-size = <4096>; - write-block-size = <4>; - }; - }; - - sram0: memory@20000000 { - device_type = "memory"; - compatible = "mmio-sram"; - }; - aliases { i2c-0 = &i2c0; i2c-1 = &i2c1; @@ -72,6 +50,29 @@ }; soc { + + flash-controller@4001e000 { + compatible = "nordic,nrf52-flash-controller"; + reg = <0x4001e000 0x1000>; + + #address-cells = <1>; + #size-cells = <1>; + + label="NRF_FLASH_DRV_NAME"; + + flash0: flash@0 { + compatible = "soc-nv-flash"; + label = "NRF_FLASH"; + erase-block-size = <4096>; + write-block-size = <4>; + }; + }; + + sram0: memory@20000000 { + device_type = "memory"; + compatible = "mmio-sram"; + }; + adc: adc@40007000 { compatible = "nordic,nrf-saadc"; reg = <0x40007000 0x1000>; diff --git a/dts/arm/nordic/nrf9160.dtsi b/dts/arm/nordic/nrf9160.dtsi index 3620f15d5f0..1cc89cb5fb5 100644 --- a/dts/arm/nordic/nrf9160.dtsi +++ b/dts/arm/nordic/nrf9160.dtsi @@ -20,11 +20,6 @@ }; }; - sram0: memory@20000000 { - device_type = "memory"; - compatible = "mmio-sram"; - }; - aliases { flash-controller = &flash_controller; ficr = &ficr; @@ -60,6 +55,11 @@ }; soc { + sram0: memory@20000000 { + device_type = "memory"; + compatible = "mmio-sram"; + }; + peripheral@50000000 { #address-cells = <1>; #size-cells = <1>; diff --git a/dts/arm/nordic/nrf9160ns.dtsi b/dts/arm/nordic/nrf9160ns.dtsi index 16af201135f..5c4033f5faf 100644 --- a/dts/arm/nordic/nrf9160ns.dtsi +++ b/dts/arm/nordic/nrf9160ns.dtsi @@ -20,11 +20,6 @@ }; }; - sram0: memory@20000000 { - device_type = "memory"; - compatible = "mmio-sram"; - }; - aliases { flash-controller = &flash_controller; rtc-0 = &rtc0; @@ -58,6 +53,11 @@ }; soc { + sram0: memory@20000000 { + device_type = "memory"; + compatible = "mmio-sram"; + }; + peripheral@40000000 { #address-cells = <1>; #size-cells = <1>;