From ebd0ff9f2842aebb30c51e57965c3b1d8546772c Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 25 Sep 2018 22:06:34 -0500 Subject: [PATCH] dts: arm: st: Remove use of CONFIG_SOC_* from STM32 F0 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 F0 dtsi files into their own dir. Signed-off-by: Kumar Gala --- boards/arm/nucleo_f030r8/nucleo_f030r8.dts | 2 +- boards/arm/nucleo_f070rb/nucleo_f070rb.dts | 2 +- boards/arm/nucleo_f091rc/nucleo_f091rc.dts | 2 +- boards/arm/stm32f072_eval/stm32f072_eval.dts | 2 +- .../arm/stm32f072b_disco/stm32f072b_disco.dts | 2 +- boards/arm/stm32f0_disco/stm32f0_disco.dts | 2 +- dts/arm/st/{ => f0}/stm32f0-pinctrl.dtsi | 0 dts/arm/st/{ => f0}/stm32f0.dtsi | 5 +---- dts/arm/st/{ => f0}/stm32f030.dtsi | 2 +- dts/arm/st/{ => f0}/stm32f030X8.dtsi | 14 +++++++++++-- dts/arm/st/{ => f0}/stm32f030Xc.dtsi | 3 ++- dts/arm/st/{ => f0}/stm32f051.dtsi | 2 +- dts/arm/st/f0/stm32f051X8.dtsi | 21 +++++++++++++++++++ dts/arm/st/{ => f0}/stm32f070.dtsi | 2 +- dts/arm/st/f0/stm32f070Xb.dtsi | 21 +++++++++++++++++++ dts/arm/st/{ => f0}/stm32f072.dtsi | 2 +- dts/arm/st/f0/stm32f072Xb.dtsi | 21 +++++++++++++++++++ dts/arm/st/{ => f0}/stm32f091.dtsi | 2 +- dts/arm/st/f0/stm32f091Xc.dtsi | 21 +++++++++++++++++++ 19 files changed, 110 insertions(+), 18 deletions(-) rename dts/arm/st/{ => f0}/stm32f0-pinctrl.dtsi (100%) rename dts/arm/st/{ => f0}/stm32f0.dtsi (97%) rename dts/arm/st/{ => f0}/stm32f030.dtsi (74%) rename dts/arm/st/{ => f0}/stm32f030X8.dtsi (62%) rename dts/arm/st/{ => f0}/stm32f030Xc.dtsi (88%) rename dts/arm/st/{ => f0}/stm32f051.dtsi (77%) create mode 100644 dts/arm/st/f0/stm32f051X8.dtsi rename dts/arm/st/{ => f0}/stm32f070.dtsi (95%) create mode 100644 dts/arm/st/f0/stm32f070Xb.dtsi rename dts/arm/st/{ => f0}/stm32f072.dtsi (98%) create mode 100644 dts/arm/st/f0/stm32f072Xb.dtsi rename dts/arm/st/{ => f0}/stm32f091.dtsi (96%) create mode 100644 dts/arm/st/f0/stm32f091Xc.dtsi diff --git a/boards/arm/nucleo_f030r8/nucleo_f030r8.dts b/boards/arm/nucleo_f030r8/nucleo_f030r8.dts index edf9fea452c..2b8390251aa 100644 --- a/boards/arm/nucleo_f030r8/nucleo_f030r8.dts +++ b/boards/arm/nucleo_f030r8/nucleo_f030r8.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32F030R8-NUCLEO board"; diff --git a/boards/arm/nucleo_f070rb/nucleo_f070rb.dts b/boards/arm/nucleo_f070rb/nucleo_f070rb.dts index db71dd4f128..920304295a4 100644 --- a/boards/arm/nucleo_f070rb/nucleo_f070rb.dts +++ b/boards/arm/nucleo_f070rb/nucleo_f070rb.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics NUCLEO-F070RB board"; diff --git a/boards/arm/nucleo_f091rc/nucleo_f091rc.dts b/boards/arm/nucleo_f091rc/nucleo_f091rc.dts index 1ff19d23df2..8f04e515e1c 100644 --- a/boards/arm/nucleo_f091rc/nucleo_f091rc.dts +++ b/boards/arm/nucleo_f091rc/nucleo_f091rc.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32F091RC-NUCLEO board"; diff --git a/boards/arm/stm32f072_eval/stm32f072_eval.dts b/boards/arm/stm32f072_eval/stm32f072_eval.dts index 61f291fe6b3..444ed7a1fa4 100644 --- a/boards/arm/stm32f072_eval/stm32f072_eval.dts +++ b/boards/arm/stm32f072_eval/stm32f072_eval.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32F072-EVAL board"; diff --git a/boards/arm/stm32f072b_disco/stm32f072b_disco.dts b/boards/arm/stm32f072b_disco/stm32f072b_disco.dts index 5190fd610d3..90d1053b757 100644 --- a/boards/arm/stm32f072b_disco/stm32f072b_disco.dts +++ b/boards/arm/stm32f072b_disco/stm32f072b_disco.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32F072B-DISCO board"; diff --git a/boards/arm/stm32f0_disco/stm32f0_disco.dts b/boards/arm/stm32f0_disco/stm32f0_disco.dts index 2fa2933d23c..69d52d3e6bf 100644 --- a/boards/arm/stm32f0_disco/stm32f0_disco.dts +++ b/boards/arm/stm32f0_disco/stm32f0_disco.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include / { model = "STMicroelectronics STM32F0DISCOVERY board"; diff --git a/dts/arm/st/stm32f0-pinctrl.dtsi b/dts/arm/st/f0/stm32f0-pinctrl.dtsi similarity index 100% rename from dts/arm/st/stm32f0-pinctrl.dtsi rename to dts/arm/st/f0/stm32f0-pinctrl.dtsi diff --git a/dts/arm/st/stm32f0.dtsi b/dts/arm/st/f0/stm32f0.dtsi similarity index 97% rename from dts/arm/st/stm32f0.dtsi rename to dts/arm/st/f0/stm32f0.dtsi index 3eeca4ca33e..4025dc6e3a0 100644 --- a/dts/arm/st/stm32f0.dtsi +++ b/dts/arm/st/f0/stm32f0.dtsi @@ -4,9 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#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 = <2>; }; diff --git a/dts/arm/st/stm32f030.dtsi b/dts/arm/st/f0/stm32f030.dtsi similarity index 74% rename from dts/arm/st/stm32f030.dtsi rename to dts/arm/st/f0/stm32f030.dtsi index cd28d1d32ff..b4e6f73714a 100644 --- a/dts/arm/st/stm32f030.dtsi +++ b/dts/arm/st/f0/stm32f030.dtsi @@ -4,4 +4,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/dts/arm/st/stm32f030X8.dtsi b/dts/arm/st/f0/stm32f030X8.dtsi similarity index 62% rename from dts/arm/st/stm32f030X8.dtsi rename to dts/arm/st/f0/stm32f030X8.dtsi index 3689b5e45f6..34a95ae010a 100644 --- a/dts/arm/st/stm32f030X8.dtsi +++ b/dts/arm/st/f0/stm32f030X8.dtsi @@ -3,11 +3,21 @@ * * SPDX-License-Identifier: Apache-2.0 */ - -#include +#include +#include / { + sram0: memory@20000000 { + reg = <0x20000000 DT_SIZE_K(8)>; + }; + soc { + flash-controller@40022000 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(64)>; + }; + }; + spi2: spi@40003800 { compatible = "st,stm32-spi-fifo"; #address-cells = <1>; diff --git a/dts/arm/st/stm32f030Xc.dtsi b/dts/arm/st/f0/stm32f030Xc.dtsi similarity index 88% rename from dts/arm/st/stm32f030Xc.dtsi rename to dts/arm/st/f0/stm32f030Xc.dtsi index 3689b5e45f6..16ec45aeeaf 100644 --- a/dts/arm/st/stm32f030Xc.dtsi +++ b/dts/arm/st/f0/stm32f030Xc.dtsi @@ -4,7 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include +#include / { soc { diff --git a/dts/arm/st/stm32f051.dtsi b/dts/arm/st/f0/stm32f051.dtsi similarity index 77% rename from dts/arm/st/stm32f051.dtsi rename to dts/arm/st/f0/stm32f051.dtsi index 278ccc69927..be37e56c40d 100644 --- a/dts/arm/st/stm32f051.dtsi +++ b/dts/arm/st/f0/stm32f051.dtsi @@ -4,4 +4,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/dts/arm/st/f0/stm32f051X8.dtsi b/dts/arm/st/f0/stm32f051X8.dtsi new file mode 100644 index 00000000000..0b2e8a8af49 --- /dev/null +++ b/dts/arm/st/f0/stm32f051X8.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(8)>; + }; + + soc { + flash-controller@40022000 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(64)>; + }; + }; + }; +}; diff --git a/dts/arm/st/stm32f070.dtsi b/dts/arm/st/f0/stm32f070.dtsi similarity index 95% rename from dts/arm/st/stm32f070.dtsi rename to dts/arm/st/f0/stm32f070.dtsi index 434f557815c..1c81916fd0f 100644 --- a/dts/arm/st/stm32f070.dtsi +++ b/dts/arm/st/f0/stm32f070.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include / { soc { diff --git a/dts/arm/st/f0/stm32f070Xb.dtsi b/dts/arm/st/f0/stm32f070Xb.dtsi new file mode 100644 index 00000000000..07d99240045 --- /dev/null +++ b/dts/arm/st/f0/stm32f070Xb.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(16)>; + }; + + soc { + flash-controller@40022000 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(128)>; + }; + }; + }; +}; diff --git a/dts/arm/st/stm32f072.dtsi b/dts/arm/st/f0/stm32f072.dtsi similarity index 98% rename from dts/arm/st/stm32f072.dtsi rename to dts/arm/st/f0/stm32f072.dtsi index c09c82bf7e4..c8f0f129cd7 100644 --- a/dts/arm/st/stm32f072.dtsi +++ b/dts/arm/st/f0/stm32f072.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include / { soc { diff --git a/dts/arm/st/f0/stm32f072Xb.dtsi b/dts/arm/st/f0/stm32f072Xb.dtsi new file mode 100644 index 00000000000..23275581835 --- /dev/null +++ b/dts/arm/st/f0/stm32f072Xb.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(16)>; + }; + + soc { + flash-controller@40022000 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(128)>; + }; + }; + }; +}; diff --git a/dts/arm/st/stm32f091.dtsi b/dts/arm/st/f0/stm32f091.dtsi similarity index 96% rename from dts/arm/st/stm32f091.dtsi rename to dts/arm/st/f0/stm32f091.dtsi index a9a51cbd2c4..6a62c96f5c1 100644 --- a/dts/arm/st/stm32f091.dtsi +++ b/dts/arm/st/f0/stm32f091.dtsi @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include / { soc { diff --git a/dts/arm/st/f0/stm32f091Xc.dtsi b/dts/arm/st/f0/stm32f091Xc.dtsi new file mode 100644 index 00000000000..a840f078c09 --- /dev/null +++ b/dts/arm/st/f0/stm32f091Xc.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(32)>; + }; + + soc { + flash-controller@40022000 { + flash0: flash@8000000 { + reg = <0x08000000 DT_SIZE_K(256)>; + }; + }; + }; +};