diff --git a/boards/arm/disco_l475_iot1/disco_l475_iot1.dts b/boards/arm/disco_l475_iot1/disco_l475_iot1.dts index 2ffc43d5f7..12abb8252c 100644 --- a/boards/arm/disco_l475_iot1/disco_l475_iot1.dts +++ b/boards/arm/disco_l475_iot1/disco_l475_iot1.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics B-L475E-IOT01Ax board"; diff --git a/boards/arm/nucleo_l432kc/nucleo_l432kc.dts b/boards/arm/nucleo_l432kc/nucleo_l432kc.dts index 8c0cb03a4b..c149dcc856 100644 --- a/boards/arm/nucleo_l432kc/nucleo_l432kc.dts +++ b/boards/arm/nucleo_l432kc/nucleo_l432kc.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32L432KC-NUCLEO board"; diff --git a/boards/arm/nucleo_l476rg/nucleo_l476rg.dts b/boards/arm/nucleo_l476rg/nucleo_l476rg.dts index fda63d7d7a..ddc9ca3fa4 100644 --- a/boards/arm/nucleo_l476rg/nucleo_l476rg.dts +++ b/boards/arm/nucleo_l476rg/nucleo_l476rg.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32L476RG-NUCLEO board"; diff --git a/boards/arm/stm32l476g_disco/stm32l476g_disco.dts b/boards/arm/stm32l476g_disco/stm32l476g_disco.dts index ef53190c32..f4df58e790 100644 --- a/boards/arm/stm32l476g_disco/stm32l476g_disco.dts +++ b/boards/arm/stm32l476g_disco/stm32l476g_disco.dts @@ -9,7 +9,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32L476G-DISCO board"; diff --git a/boards/arm/stm32l496g_disco/stm32l496g_disco.dts b/boards/arm/stm32l496g_disco/stm32l496g_disco.dts index 3d87788990..a2a456887d 100644 --- a/boards/arm/stm32l496g_disco/stm32l496g_disco.dts +++ b/boards/arm/stm32l496g_disco/stm32l496g_disco.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32L496G-DISCO board"; diff --git a/dts/arm/st/stm32l4-pinctrl.dtsi b/dts/arm/st/l4/stm32l4-pinctrl.dtsi similarity index 100% rename from dts/arm/st/stm32l4-pinctrl.dtsi rename to dts/arm/st/l4/stm32l4-pinctrl.dtsi diff --git a/dts/arm/st/stm32l4.dtsi b/dts/arm/st/l4/stm32l4.dtsi similarity index 98% rename from dts/arm/st/stm32l4.dtsi rename to dts/arm/st/l4/stm32l4.dtsi index 2a3510048d..8d001d45c7 100644 --- a/dts/arm/st/stm32l4.dtsi +++ b/dts/arm/st/l4/stm32l4.dtsi @@ -4,10 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include #include -#include #include #include #include @@ -27,7 +26,6 @@ sram0: memory@20000000 { device_type = "memory"; compatible = "mmio-sram"; - reg = <0x20000000 DT_SRAM_SIZE>; }; soc { @@ -43,7 +41,6 @@ flash0: flash@8000000 { compatible = "soc-nv-flash"; label = "FLASH_STM32"; - reg = <0x08000000 DT_FLASH_SIZE>; write-block-size = <8>; erase-block-size = <2048>; diff --git a/dts/arm/st/stm32l432.dtsi b/dts/arm/st/l4/stm32l432.dtsi similarity index 91% rename from dts/arm/st/stm32l432.dtsi rename to dts/arm/st/l4/stm32l432.dtsi index 6a722c1fb9..90e046ef4c 100644 --- a/dts/arm/st/stm32l432.dtsi +++ b/dts/arm/st/l4/stm32l432.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include / { soc { diff --git a/dts/arm/st/l4/stm32l432Xc.dtsi b/dts/arm/st/l4/stm32l432Xc.dtsi new file mode 100644 index 0000000000..59b6e23cb4 --- /dev/null +++ b/dts/arm/st/l4/stm32l432Xc.dtsi @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2018 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ +#include +#include + +/ { + sram0: memory@20000000 { + reg = <0x20000000 DT_SIZE_K(64)>; + }; + + soc { + flash-controller@40022000 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(256)>; + }; + }; + }; +}; diff --git a/dts/arm/st/l4/stm32l433Xc.dtsi b/dts/arm/st/l4/stm32l433Xc.dtsi new file mode 100644 index 0000000000..8dc414720e --- /dev/null +++ b/dts/arm/st/l4/stm32l433Xc.dtsi @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2018 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ +#include +#include + +/ { + sram0: memory@20000000 { + reg = <0x20000000 DT_SIZE_K(64)>; + }; + + soc { + flash-controller@40022000 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(256)>; + }; + }; + }; +}; diff --git a/dts/arm/st/stm32l475.dtsi b/dts/arm/st/l4/stm32l475.dtsi similarity index 99% rename from dts/arm/st/stm32l475.dtsi rename to dts/arm/st/l4/stm32l475.dtsi index 722b489849..919e97b16d 100644 --- a/dts/arm/st/stm32l475.dtsi +++ b/dts/arm/st/l4/stm32l475.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include / { soc { diff --git a/dts/arm/st/l4/stm32l475Xg.dtsi b/dts/arm/st/l4/stm32l475Xg.dtsi new file mode 100644 index 0000000000..98af4e3611 --- /dev/null +++ b/dts/arm/st/l4/stm32l475Xg.dtsi @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2018 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ +#include +#include + +/ { + sram0: memory@20000000 { + reg = <0x20000000 DT_SIZE_K(96)>; + }; + + soc { + flash-controller@40022000 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(1024)>; + }; + }; + }; +}; diff --git a/dts/arm/st/stm32l476.dtsi b/dts/arm/st/l4/stm32l476.dtsi similarity index 73% rename from dts/arm/st/stm32l476.dtsi rename to dts/arm/st/l4/stm32l476.dtsi index 7b336a2ac2..5833598075 100644 --- a/dts/arm/st/stm32l476.dtsi +++ b/dts/arm/st/l4/stm32l476.dtsi @@ -4,4 +4,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/dts/arm/st/l4/stm32l476Xg.dtsi b/dts/arm/st/l4/stm32l476Xg.dtsi new file mode 100644 index 0000000000..af29a4636f --- /dev/null +++ b/dts/arm/st/l4/stm32l476Xg.dtsi @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2018 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ +#include +#include + +/ { + sram0: memory@20000000 { + reg = <0x20000000 DT_SIZE_K(96)>; + }; + + soc { + flash-controller@40022000 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(1024)>; + }; + }; + }; +}; diff --git a/dts/arm/st/stm32l496.dtsi b/dts/arm/st/l4/stm32l496.dtsi similarity index 95% rename from dts/arm/st/stm32l496.dtsi rename to dts/arm/st/l4/stm32l496.dtsi index 2ea61669c0..196acc1d64 100644 --- a/dts/arm/st/stm32l496.dtsi +++ b/dts/arm/st/l4/stm32l496.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include / { soc { diff --git a/dts/arm/st/l4/stm32l496Xg.dtsi b/dts/arm/st/l4/stm32l496Xg.dtsi new file mode 100644 index 0000000000..76c9d482bd --- /dev/null +++ b/dts/arm/st/l4/stm32l496Xg.dtsi @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2018 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ +#include +#include + +/ { + sram0: memory@20000000 { + reg = <0x20000000 DT_SIZE_K(320)>; + }; + + soc { + flash-controller@40022000 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(1024)>; + }; + }; + }; +};