From 52646287fd4f9ec53b87747e839e8dcd97cb722a Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 27 Sep 2018 08:23:16 -0500 Subject: [PATCH] dts: arm: st: Remove use of CONFIG_SOC_* from STM32 F4 dts files To move forward and remove use of Kconfig in dts files lets just create SoC specific dtsi files that the boards can include. We also seperate out the F4 dtsi files into their own dir. Signed-off-by: Kumar Gala --- boards/arm/96b_argonkey/96b_argonkey.dts | 2 +- boards/arm/96b_carbon/96b_carbon.dts | 2 +- boards/arm/96b_neonkey/96b_neonkey.dts | 2 +- boards/arm/nucleo_f401re/nucleo_f401re.dts | 2 +- boards/arm/nucleo_f411re/nucleo_f411re.dts | 2 +- boards/arm/nucleo_f412zg/nucleo_f412zg.dts | 2 +- boards/arm/nucleo_f413zh/nucleo_f413zh.dts | 2 +- boards/arm/nucleo_f429zi/nucleo_f429zi.dts | 2 +- boards/arm/nucleo_f446re/nucleo_f446re.dts | 2 +- .../olimex_stm32_e407/olimex_stm32_e407.dts | 2 +- .../olimex_stm32_h407/olimex_stm32_h407.dts | 2 +- .../olimex_stm32_p405/olimex_stm32_p405.dts | 2 +- .../arm/stm32f411e_disco/stm32f411e_disco.dts | 2 +- .../arm/stm32f412g_disco/stm32f412g_disco.dts | 2 +- .../arm/stm32f429i_disc1/stm32f429i_disc1.dts | 2 +- .../arm/stm32f469i_disco/stm32f469i_disco.dts | 2 +- boards/arm/stm32f4_disco/stm32f4_disco.dts | 2 +- dts/arm/st/{ => f4}/stm32f4-pinctrl.dtsi | 0 dts/arm/st/{ => f4}/stm32f4.dtsi | 5 +--- dts/arm/st/{ => f4}/stm32f401.dtsi | 2 +- dts/arm/st/f4/stm32f401Xe.dtsi | 22 +++++++++++++++ dts/arm/st/{ => f4}/stm32f405-pinctrl.dtsi | 0 dts/arm/st/{ => f4}/stm32f405.dtsi | 9 ++----- dts/arm/st/f4/stm32f405Xg.dtsi | 27 +++++++++++++++++++ dts/arm/st/{ => f4}/stm32f407.dtsi | 2 +- dts/arm/st/f4/stm32f407Xg.dtsi | 27 +++++++++++++++++++ dts/arm/st/{ => f4}/stm32f411.dtsi | 2 +- dts/arm/st/f4/stm32f411Xe.dtsi | 22 +++++++++++++++ dts/arm/st/{ => f4}/stm32f412-pinctrl.dtsi | 0 dts/arm/st/{ => f4}/stm32f412.dtsi | 4 +-- dts/arm/st/f4/stm32f412cg.dtsi | 22 +++++++++++++++ dts/arm/st/f4/stm32f412zg.dtsi | 22 +++++++++++++++ dts/arm/st/{ => f4}/stm32f413-pinctrl.dtsi | 0 dts/arm/st/{ => f4}/stm32f413.dtsi | 4 +-- dts/arm/st/f4/stm32f413Xh.dtsi | 22 +++++++++++++++ dts/arm/st/{ => f4}/stm32f417.dtsi | 2 +- dts/arm/st/f4/stm32f417Xe.dtsi | 27 +++++++++++++++++++ dts/arm/st/f4/stm32f417Xg.dtsi | 27 +++++++++++++++++++ dts/arm/st/{ => f4}/stm32f429.dtsi | 2 +- dts/arm/st/f4/stm32f429Xi.dtsi | 27 +++++++++++++++++++ dts/arm/st/{ => f4}/stm32f429vX.dtsi | 2 +- dts/arm/st/{ => f4}/stm32f446.dtsi | 2 +- dts/arm/st/f4/stm32f446Xe.dtsi | 22 +++++++++++++++ dts/arm/st/{ => f4}/stm32f469.dtsi | 2 +- dts/arm/st/f4/stm32f469Xi.dtsi | 27 +++++++++++++++++++ 45 files changed, 326 insertions(+), 40 deletions(-) rename dts/arm/st/{ => f4}/stm32f4-pinctrl.dtsi (100%) rename dts/arm/st/{ => f4}/stm32f4.dtsi (98%) rename dts/arm/st/{ => f4}/stm32f401.dtsi (95%) create mode 100644 dts/arm/st/f4/stm32f401Xe.dtsi rename dts/arm/st/{ => f4}/stm32f405-pinctrl.dtsi (100%) rename dts/arm/st/{ => f4}/stm32f405.dtsi (96%) create mode 100644 dts/arm/st/f4/stm32f405Xg.dtsi rename dts/arm/st/{ => f4}/stm32f407.dtsi (76%) create mode 100644 dts/arm/st/f4/stm32f407Xg.dtsi rename dts/arm/st/{ => f4}/stm32f411.dtsi (94%) create mode 100644 dts/arm/st/f4/stm32f411Xe.dtsi rename dts/arm/st/{ => f4}/stm32f412-pinctrl.dtsi (100%) rename dts/arm/st/{ => f4}/stm32f412.dtsi (97%) create mode 100644 dts/arm/st/f4/stm32f412cg.dtsi create mode 100644 dts/arm/st/f4/stm32f412zg.dtsi rename dts/arm/st/{ => f4}/stm32f413-pinctrl.dtsi (100%) rename dts/arm/st/{ => f4}/stm32f413.dtsi (98%) create mode 100644 dts/arm/st/f4/stm32f413Xh.dtsi rename dts/arm/st/{ => f4}/stm32f417.dtsi (73%) create mode 100644 dts/arm/st/f4/stm32f417Xe.dtsi create mode 100644 dts/arm/st/f4/stm32f417Xg.dtsi rename dts/arm/st/{ => f4}/stm32f429.dtsi (98%) create mode 100644 dts/arm/st/f4/stm32f429Xi.dtsi rename dts/arm/st/{ => f4}/stm32f429vX.dtsi (94%) rename dts/arm/st/{ => f4}/stm32f446.dtsi (93%) create mode 100644 dts/arm/st/f4/stm32f446Xe.dtsi rename dts/arm/st/{ => f4}/stm32f469.dtsi (88%) create mode 100644 dts/arm/st/f4/stm32f469Xi.dtsi diff --git a/boards/arm/96b_argonkey/96b_argonkey.dts b/boards/arm/96b_argonkey/96b_argonkey.dts index ed15f2a2c72..d9f9a336aa0 100644 --- a/boards/arm/96b_argonkey/96b_argonkey.dts +++ b/boards/arm/96b_argonkey/96b_argonkey.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "Tocoding Argonkey 96boards"; diff --git a/boards/arm/96b_carbon/96b_carbon.dts b/boards/arm/96b_carbon/96b_carbon.dts index f87615f964e..fc81a7be471 100644 --- a/boards/arm/96b_carbon/96b_carbon.dts +++ b/boards/arm/96b_carbon/96b_carbon.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "Seeed Studio Carbon 96boards"; diff --git a/boards/arm/96b_neonkey/96b_neonkey.dts b/boards/arm/96b_neonkey/96b_neonkey.dts index 18f456c5ef0..39a4272403a 100644 --- a/boards/arm/96b_neonkey/96b_neonkey.dts +++ b/boards/arm/96b_neonkey/96b_neonkey.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "Tocoding Neonkey 96boards"; diff --git a/boards/arm/nucleo_f401re/nucleo_f401re.dts b/boards/arm/nucleo_f401re/nucleo_f401re.dts index ec283f64add..cff46acf496 100644 --- a/boards/arm/nucleo_f401re/nucleo_f401re.dts +++ b/boards/arm/nucleo_f401re/nucleo_f401re.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32F401RE-NUCLEO board"; diff --git a/boards/arm/nucleo_f411re/nucleo_f411re.dts b/boards/arm/nucleo_f411re/nucleo_f411re.dts index 5d606789717..0af1ca0fe39 100644 --- a/boards/arm/nucleo_f411re/nucleo_f411re.dts +++ b/boards/arm/nucleo_f411re/nucleo_f411re.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32F411RE-NUCLEO board"; diff --git a/boards/arm/nucleo_f412zg/nucleo_f412zg.dts b/boards/arm/nucleo_f412zg/nucleo_f412zg.dts index 19f124e6ca8..ea7cf7e9866 100644 --- a/boards/arm/nucleo_f412zg/nucleo_f412zg.dts +++ b/boards/arm/nucleo_f412zg/nucleo_f412zg.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32F412ZG-NUCLEO board"; diff --git a/boards/arm/nucleo_f413zh/nucleo_f413zh.dts b/boards/arm/nucleo_f413zh/nucleo_f413zh.dts index 55082e55e99..0f88a50100e 100644 --- a/boards/arm/nucleo_f413zh/nucleo_f413zh.dts +++ b/boards/arm/nucleo_f413zh/nucleo_f413zh.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32F413ZH-NUCLEO board"; diff --git a/boards/arm/nucleo_f429zi/nucleo_f429zi.dts b/boards/arm/nucleo_f429zi/nucleo_f429zi.dts index dcd5a45e17e..027b3ff05ac 100644 --- a/boards/arm/nucleo_f429zi/nucleo_f429zi.dts +++ b/boards/arm/nucleo_f429zi/nucleo_f429zi.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32F429ZI-NUCLEO board"; diff --git a/boards/arm/nucleo_f446re/nucleo_f446re.dts b/boards/arm/nucleo_f446re/nucleo_f446re.dts index c6b60ffc1b9..858ad5bdfd6 100644 --- a/boards/arm/nucleo_f446re/nucleo_f446re.dts +++ b/boards/arm/nucleo_f446re/nucleo_f446re.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32F446RE-NUCLEO board"; diff --git a/boards/arm/olimex_stm32_e407/olimex_stm32_e407.dts b/boards/arm/olimex_stm32_e407/olimex_stm32_e407.dts index 538cbe4cea0..281ef336ff0 100644 --- a/boards/arm/olimex_stm32_e407/olimex_stm32_e407.dts +++ b/boards/arm/olimex_stm32_e407/olimex_stm32_e407.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "Olimex STM32-E407 board"; diff --git a/boards/arm/olimex_stm32_h407/olimex_stm32_h407.dts b/boards/arm/olimex_stm32_h407/olimex_stm32_h407.dts index af45aa6abc5..14845b8b6d0 100644 --- a/boards/arm/olimex_stm32_h407/olimex_stm32_h407.dts +++ b/boards/arm/olimex_stm32_h407/olimex_stm32_h407.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "Olimex STM32-H407 board"; diff --git a/boards/arm/olimex_stm32_p405/olimex_stm32_p405.dts b/boards/arm/olimex_stm32_p405/olimex_stm32_p405.dts index 0c651c65968..ea7dfc7e99c 100644 --- a/boards/arm/olimex_stm32_p405/olimex_stm32_p405.dts +++ b/boards/arm/olimex_stm32_p405/olimex_stm32_p405.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "Olimex STM32-P405 board"; diff --git a/boards/arm/stm32f411e_disco/stm32f411e_disco.dts b/boards/arm/stm32f411e_disco/stm32f411e_disco.dts index 9b2dc4779b6..31472934392 100644 --- a/boards/arm/stm32f411e_disco/stm32f411e_disco.dts +++ b/boards/arm/stm32f411e_disco/stm32f411e_disco.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32F411E-DISCO board"; diff --git a/boards/arm/stm32f412g_disco/stm32f412g_disco.dts b/boards/arm/stm32f412g_disco/stm32f412g_disco.dts index 459a959fcf4..576878b2f67 100644 --- a/boards/arm/stm32f412g_disco/stm32f412g_disco.dts +++ b/boards/arm/stm32f412g_disco/stm32f412g_disco.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32F412G-DISCO board"; diff --git a/boards/arm/stm32f429i_disc1/stm32f429i_disc1.dts b/boards/arm/stm32f429i_disc1/stm32f429i_disc1.dts index 4cb25db949d..61c3ba98ad5 100644 --- a/boards/arm/stm32f429i_disc1/stm32f429i_disc1.dts +++ b/boards/arm/stm32f429i_disc1/stm32f429i_disc1.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32F429I_DISC1 board"; diff --git a/boards/arm/stm32f469i_disco/stm32f469i_disco.dts b/boards/arm/stm32f469i_disco/stm32f469i_disco.dts index 568dd2fbbe0..0695a4e3567 100644 --- a/boards/arm/stm32f469i_disco/stm32f469i_disco.dts +++ b/boards/arm/stm32f469i_disco/stm32f469i_disco.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32F469I-DISCO board"; diff --git a/boards/arm/stm32f4_disco/stm32f4_disco.dts b/boards/arm/stm32f4_disco/stm32f4_disco.dts index d3a67ff7e98..0f4ff32903d 100644 --- a/boards/arm/stm32f4_disco/stm32f4_disco.dts +++ b/boards/arm/stm32f4_disco/stm32f4_disco.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32F4DISCOVERY board"; diff --git a/dts/arm/st/stm32f4-pinctrl.dtsi b/dts/arm/st/f4/stm32f4-pinctrl.dtsi similarity index 100% rename from dts/arm/st/stm32f4-pinctrl.dtsi rename to dts/arm/st/f4/stm32f4-pinctrl.dtsi diff --git a/dts/arm/st/stm32f4.dtsi b/dts/arm/st/f4/stm32f4.dtsi similarity index 98% rename from dts/arm/st/stm32f4.dtsi rename to dts/arm/st/f4/stm32f4.dtsi index aa73ca96b0c..eb6f834b2cf 100644 --- a/dts/arm/st/stm32f4.dtsi +++ b/dts/arm/st/f4/stm32f4.dtsi @@ -5,8 +5,7 @@ */ #include -#include -#include +#include #include #include #include @@ -26,7 +25,6 @@ sram0: memory@20000000 { device_type = "memory"; compatible = "mmio-sram"; - reg = <0x20000000 DT_SRAM_SIZE>; }; soc { @@ -42,7 +40,6 @@ flash0: flash@8000000 { compatible = "soc-nv-flash"; label = "FLASH_STM32"; - reg = <0x08000000 DT_FLASH_SIZE>; write-block-size = <1>; }; diff --git a/dts/arm/st/stm32f401.dtsi b/dts/arm/st/f4/stm32f401.dtsi similarity index 95% rename from dts/arm/st/stm32f401.dtsi rename to dts/arm/st/f4/stm32f401.dtsi index 2435df8b259..82810a45054 100644 --- a/dts/arm/st/stm32f401.dtsi +++ b/dts/arm/st/f4/stm32f401.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include / { soc { diff --git a/dts/arm/st/f4/stm32f401Xe.dtsi b/dts/arm/st/f4/stm32f401Xe.dtsi new file mode 100644 index 00000000000..087bcb9469a --- /dev/null +++ b/dts/arm/st/f4/stm32f401Xe.dtsi @@ -0,0 +1,22 @@ +/* + * 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@40023c00 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(512)>; + }; + }; + }; +}; diff --git a/dts/arm/st/stm32f405-pinctrl.dtsi b/dts/arm/st/f4/stm32f405-pinctrl.dtsi similarity index 100% rename from dts/arm/st/stm32f405-pinctrl.dtsi rename to dts/arm/st/f4/stm32f405-pinctrl.dtsi diff --git a/dts/arm/st/stm32f405.dtsi b/dts/arm/st/f4/stm32f405.dtsi similarity index 96% rename from dts/arm/st/stm32f405.dtsi rename to dts/arm/st/f4/stm32f405.dtsi index c30ebe9a3d6..b4e622341ac 100644 --- a/dts/arm/st/stm32f405.dtsi +++ b/dts/arm/st/f4/stm32f405.dtsi @@ -4,15 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include -#include +#include +#include / { - ccm0: memory@10000000 { - compatible = "st,stm32-ccm"; - reg = <0x10000000 DT_CCM_SIZE>; - }; - soc { pinctrl: pin-controller@40020000 { reg = <0x40020000 0x2400>; diff --git a/dts/arm/st/f4/stm32f405Xg.dtsi b/dts/arm/st/f4/stm32f405Xg.dtsi new file mode 100644 index 00000000000..6d42541c2c9 --- /dev/null +++ b/dts/arm/st/f4/stm32f405Xg.dtsi @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2018 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include +#include + +/ { + ccm0: memory@10000000 { + compatible = "st,stm32-ccm"; + reg = <0x10000000 DT_SIZE_K(64)>; + }; + + sram0: memory@20000000 { + reg = <0x20000000 DT_SIZE_K(192)>; + }; + + soc { + flash-controller@40023c00 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(1024)>; + }; + }; + }; +}; diff --git a/dts/arm/st/stm32f407.dtsi b/dts/arm/st/f4/stm32f407.dtsi similarity index 76% rename from dts/arm/st/stm32f407.dtsi rename to dts/arm/st/f4/stm32f407.dtsi index 688dcecea6f..0c134a4c4e8 100644 --- a/dts/arm/st/stm32f407.dtsi +++ b/dts/arm/st/f4/stm32f407.dtsi @@ -4,4 +4,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/dts/arm/st/f4/stm32f407Xg.dtsi b/dts/arm/st/f4/stm32f407Xg.dtsi new file mode 100644 index 00000000000..775d87db585 --- /dev/null +++ b/dts/arm/st/f4/stm32f407Xg.dtsi @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2018 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include +#include + +/ { + ccm0: memory@10000000 { + compatible = "st,stm32-ccm"; + reg = <0x10000000 DT_SIZE_K(64)>; + }; + + sram0: memory@20000000 { + reg = <0x20000000 DT_SIZE_K(192)>; + }; + + soc { + flash-controller@40023c00 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(1024)>; + }; + }; + }; +}; diff --git a/dts/arm/st/stm32f411.dtsi b/dts/arm/st/f4/stm32f411.dtsi similarity index 94% rename from dts/arm/st/stm32f411.dtsi rename to dts/arm/st/f4/stm32f411.dtsi index ba33560601a..41634fe44bd 100644 --- a/dts/arm/st/stm32f411.dtsi +++ b/dts/arm/st/f4/stm32f411.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include / { soc { diff --git a/dts/arm/st/f4/stm32f411Xe.dtsi b/dts/arm/st/f4/stm32f411Xe.dtsi new file mode 100644 index 00000000000..bc9e8b2c2e5 --- /dev/null +++ b/dts/arm/st/f4/stm32f411Xe.dtsi @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2018 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include +#include + +/ { + sram0: memory@20000000 { + reg = <0x20000000 DT_SIZE_K(128)>; + }; + + soc { + flash-controller@40023c00 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(512)>; + }; + }; + }; +}; diff --git a/dts/arm/st/stm32f412-pinctrl.dtsi b/dts/arm/st/f4/stm32f412-pinctrl.dtsi similarity index 100% rename from dts/arm/st/stm32f412-pinctrl.dtsi rename to dts/arm/st/f4/stm32f412-pinctrl.dtsi diff --git a/dts/arm/st/stm32f412.dtsi b/dts/arm/st/f4/stm32f412.dtsi similarity index 97% rename from dts/arm/st/stm32f412.dtsi rename to dts/arm/st/f4/stm32f412.dtsi index c638f688692..86c6fb2d430 100644 --- a/dts/arm/st/stm32f412.dtsi +++ b/dts/arm/st/f4/stm32f412.dtsi @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include -#include +#include +#include / { soc { diff --git a/dts/arm/st/f4/stm32f412cg.dtsi b/dts/arm/st/f4/stm32f412cg.dtsi new file mode 100644 index 00000000000..a6958857dbc --- /dev/null +++ b/dts/arm/st/f4/stm32f412cg.dtsi @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2018 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include +#include + +/ { + sram0: memory@20000000 { + reg = <0x20000000 DT_SIZE_K(256)>; + }; + + soc { + flash-controller@40023c00 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(1024)>; + }; + }; + }; +}; diff --git a/dts/arm/st/f4/stm32f412zg.dtsi b/dts/arm/st/f4/stm32f412zg.dtsi new file mode 100644 index 00000000000..a6958857dbc --- /dev/null +++ b/dts/arm/st/f4/stm32f412zg.dtsi @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2018 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include +#include + +/ { + sram0: memory@20000000 { + reg = <0x20000000 DT_SIZE_K(256)>; + }; + + soc { + flash-controller@40023c00 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(1024)>; + }; + }; + }; +}; diff --git a/dts/arm/st/stm32f413-pinctrl.dtsi b/dts/arm/st/f4/stm32f413-pinctrl.dtsi similarity index 100% rename from dts/arm/st/stm32f413-pinctrl.dtsi rename to dts/arm/st/f4/stm32f413-pinctrl.dtsi diff --git a/dts/arm/st/stm32f413.dtsi b/dts/arm/st/f4/stm32f413.dtsi similarity index 98% rename from dts/arm/st/stm32f413.dtsi rename to dts/arm/st/f4/stm32f413.dtsi index 50dc7fd4387..02c324cc326 100644 --- a/dts/arm/st/stm32f413.dtsi +++ b/dts/arm/st/f4/stm32f413.dtsi @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include -#include +#include +#include / { soc { diff --git a/dts/arm/st/f4/stm32f413Xh.dtsi b/dts/arm/st/f4/stm32f413Xh.dtsi new file mode 100644 index 00000000000..6e79b06b784 --- /dev/null +++ b/dts/arm/st/f4/stm32f413Xh.dtsi @@ -0,0 +1,22 @@ +/* + * 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@40023c00 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(1536)>; + }; + }; + }; +}; diff --git a/dts/arm/st/stm32f417.dtsi b/dts/arm/st/f4/stm32f417.dtsi similarity index 73% rename from dts/arm/st/stm32f417.dtsi rename to dts/arm/st/f4/stm32f417.dtsi index 5c15178470c..70e2d95e254 100644 --- a/dts/arm/st/stm32f417.dtsi +++ b/dts/arm/st/f4/stm32f417.dtsi @@ -4,5 +4,5 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/dts/arm/st/f4/stm32f417Xe.dtsi b/dts/arm/st/f4/stm32f417Xe.dtsi new file mode 100644 index 00000000000..c7fb49cdf74 --- /dev/null +++ b/dts/arm/st/f4/stm32f417Xe.dtsi @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2018 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include +#include + +/ { + ccm0: memory@10000000 { + compatible = "st,stm32-ccm"; + reg = <0x10000000 DT_SIZE_K(64)>; + }; + + sram0: memory@20000000 { + reg = <0x20000000 DT_SIZE_K(192)>; + }; + + soc { + flash-controller@40023c00 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(512)>; + }; + }; + }; +}; diff --git a/dts/arm/st/f4/stm32f417Xg.dtsi b/dts/arm/st/f4/stm32f417Xg.dtsi new file mode 100644 index 00000000000..6d42541c2c9 --- /dev/null +++ b/dts/arm/st/f4/stm32f417Xg.dtsi @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2018 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include +#include + +/ { + ccm0: memory@10000000 { + compatible = "st,stm32-ccm"; + reg = <0x10000000 DT_SIZE_K(64)>; + }; + + sram0: memory@20000000 { + reg = <0x20000000 DT_SIZE_K(192)>; + }; + + soc { + flash-controller@40023c00 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(1024)>; + }; + }; + }; +}; diff --git a/dts/arm/st/stm32f429.dtsi b/dts/arm/st/f4/stm32f429.dtsi similarity index 98% rename from dts/arm/st/stm32f429.dtsi rename to dts/arm/st/f4/stm32f429.dtsi index 13f5f07d139..5a5e77ee1a8 100644 --- a/dts/arm/st/stm32f429.dtsi +++ b/dts/arm/st/f4/stm32f429.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include / { soc { diff --git a/dts/arm/st/f4/stm32f429Xi.dtsi b/dts/arm/st/f4/stm32f429Xi.dtsi new file mode 100644 index 00000000000..3a40de7a3f2 --- /dev/null +++ b/dts/arm/st/f4/stm32f429Xi.dtsi @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2018 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include +#include + +/ { + ccm0: memory@10000000 { + compatible = "st,stm32-ccm"; + reg = <0x10000000 DT_SIZE_K(64)>; + }; + + sram0: memory@20000000 { + reg = <0x20000000 DT_SIZE_K(256)>; + }; + + soc { + flash-controller@40023c00 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(2048)>; + }; + }; + }; +}; diff --git a/dts/arm/st/stm32f429vX.dtsi b/dts/arm/st/f4/stm32f429vX.dtsi similarity index 94% rename from dts/arm/st/stm32f429vX.dtsi rename to dts/arm/st/f4/stm32f429vX.dtsi index c97e23d369d..afa86f77bb0 100644 --- a/dts/arm/st/stm32f429vX.dtsi +++ b/dts/arm/st/f4/stm32f429vX.dtsi @@ -14,7 +14,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include /delete-node/ &spi5; diff --git a/dts/arm/st/stm32f446.dtsi b/dts/arm/st/f4/stm32f446.dtsi similarity index 93% rename from dts/arm/st/stm32f446.dtsi rename to dts/arm/st/f4/stm32f446.dtsi index 1fb2fcaa460..46bc3f1fcf7 100644 --- a/dts/arm/st/stm32f446.dtsi +++ b/dts/arm/st/f4/stm32f446.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include / { soc { diff --git a/dts/arm/st/f4/stm32f446Xe.dtsi b/dts/arm/st/f4/stm32f446Xe.dtsi new file mode 100644 index 00000000000..e1c9929ef4d --- /dev/null +++ b/dts/arm/st/f4/stm32f446Xe.dtsi @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2018 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include +#include + +/ { + sram0: memory@20000000 { + reg = <0x20000000 DT_SIZE_K(128)>; + }; + + soc { + flash-controller@40023c00 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(512)>; + }; + }; + }; +}; diff --git a/dts/arm/st/stm32f469.dtsi b/dts/arm/st/f4/stm32f469.dtsi similarity index 88% rename from dts/arm/st/stm32f469.dtsi rename to dts/arm/st/f4/stm32f469.dtsi index 1c8b1c86b5a..e512fbb06ce 100644 --- a/dts/arm/st/stm32f469.dtsi +++ b/dts/arm/st/f4/stm32f469.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include / { soc { diff --git a/dts/arm/st/f4/stm32f469Xi.dtsi b/dts/arm/st/f4/stm32f469Xi.dtsi new file mode 100644 index 00000000000..1447afdba2e --- /dev/null +++ b/dts/arm/st/f4/stm32f469Xi.dtsi @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2018 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include +#include + +/ { + ccm0: memory@10000000 { + compatible = "st,stm32-ccm"; + reg = <0x10000000 DT_SIZE_K(64)>; + }; + + sram0: memory@20000000 { + reg = <0x20000000 DT_SIZE_K(384)>; + }; + + soc { + flash-controller@40023c00 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(2048)>; + }; + }; + }; +};