From 607fd149ece4ce64f66dc063d416a973092b082d Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Thu, 18 May 2017 16:55:23 +0200 Subject: [PATCH] dts: stm32f4: rework family tree This commit rework stm32f4 series dtsi files hierarchy. stm32f4.dtsi was used as maximum common set of IP while it should be considered as the minimum common subset. Then, following on stm32f4 series hierarchy and inheritance rules, stm32f4xxx.dtsi files are reworked to include the "parent" soc dtsi file and then add own IPs to each SoC. Change-Id: I394278c84a8ea38921f9f143f4fc52ef1c645d05 Signed-off-by: Erwan Gouriou --- dts/arm/st/stm32f4.dtsi | 56 ----------------------------------- dts/arm/st/stm32f407.dtsi | 30 ++++++++++++++++++- dts/arm/st/stm32f411.dtsi | 2 +- dts/arm/st/stm32f413.dtsi | 62 ++++++++++++++++++++++++++++++++++++++- dts/arm/st/stm32f469.dtsi | 22 +++++++++++++- 5 files changed, 112 insertions(+), 60 deletions(-) diff --git a/dts/arm/st/stm32f4.dtsi b/dts/arm/st/stm32f4.dtsi index 45bf5da354d..afc7a6c519d 100644 --- a/dts/arm/st/stm32f4.dtsi +++ b/dts/arm/st/stm32f4.dtsi @@ -33,30 +33,6 @@ label = "UART_2"; }; - usart3: serial@40004800 { - compatible = "st,stm32-usart", "st,stm32-uart"; - reg = <0x40004800 0x400>; - interrupts = <39 0>; - status = "disabled"; - label = "UART_3"; - }; - - uart4: serial@40004c00 { - compatible ="st,stm32-uart"; - reg = <0x40004c00 0x400>; - interrupts = <52 0>; - status = "disabled"; - label = "UART_4"; - }; - - uart5: serial@40005000 { - compatible = "st,stm32-uart"; - reg = <0x40005000 0x400>; - interrupts = <53 0>; - status = "disabled"; - label = "UART_5"; - }; - usart6: serial@40011400 { compatible = "st,stm32-usart", "st,stm32-uart"; reg = <0x40011400 0x400>; @@ -64,38 +40,6 @@ status = "disabled"; label = "UART_6"; }; - - uart7: serial@40007800 { - compatible = "st,stm32-uart"; - reg = <0x40007800 0x400>; - interrupts = <82 0>; - status = "disabled"; - label = "UART_7"; - }; - - uart8: serial@40007c00 { - compatible = "st,stm32-uart"; - reg = <0x40007c00 0x400>; - interrupts = <83 0>; - status = "disabled"; - label = "UART_8"; - }; - - uart9: serial@40011800 { - compatible = "st,stm32-uart"; - reg = <0x40011800 0x400>; - interrupts = <88 0>; - status = "disabled"; - label = "UART_9"; - }; - - uart10: serial@40011c00 { - compatible = "st,stm32-uart"; - reg = <0x40011c00 0x400>; - interrupts = <89 0>; - status = "disabled"; - label = "UART_10"; - }; }; }; diff --git a/dts/arm/st/stm32f407.dtsi b/dts/arm/st/stm32f407.dtsi index c02702e5296..2420d1beff0 100644 --- a/dts/arm/st/stm32f407.dtsi +++ b/dts/arm/st/stm32f407.dtsi @@ -4,4 +4,32 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include + +/ { + soc { + usart3: serial@40004800 { + compatible = "st,stm32-usart", "st,stm32-uart"; + reg = <0x40004800 0x400>; + interrupts = <39 0>; + status = "disabled"; + label = "UART_3"; + }; + + uart4: serial@40004c00 { + compatible ="st,stm32-uart"; + reg = <0x40004c00 0x400>; + interrupts = <52 0>; + status = "disabled"; + label = "UART_4"; + }; + + uart5: serial@40005000 { + compatible = "st,stm32-uart"; + reg = <0x40005000 0x400>; + interrupts = <53 0>; + status = "disabled"; + label = "UART_5"; + }; + }; +}; diff --git a/dts/arm/st/stm32f411.dtsi b/dts/arm/st/stm32f411.dtsi index c02702e5296..4d6dbd87318 100644 --- a/dts/arm/st/stm32f411.dtsi +++ b/dts/arm/st/stm32f411.dtsi @@ -4,4 +4,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/dts/arm/st/stm32f413.dtsi b/dts/arm/st/stm32f413.dtsi index 51c286be6b7..d0dbaa90a90 100644 --- a/dts/arm/st/stm32f413.dtsi +++ b/dts/arm/st/stm32f413.dtsi @@ -4,4 +4,64 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include + +/ { + soc { + usart3: serial@40004800 { + compatible = "st,stm32-usart", "st,stm32-uart"; + reg = <0x40004800 0x400>; + interrupts = <39 0>; + status = "disabled"; + label = "UART_3"; + }; + + uart4: serial@40004c00 { + compatible ="st,stm32-uart"; + reg = <0x40004c00 0x400>; + interrupts = <52 0>; + status = "disabled"; + label = "UART_4"; + }; + + uart5: serial@40005000 { + compatible = "st,stm32-uart"; + reg = <0x40005000 0x400>; + interrupts = <53 0>; + status = "disabled"; + label = "UART_5"; + }; + + uart7: serial@40007800 { + compatible = "st,stm32-uart"; + reg = <0x40007800 0x400>; + interrupts = <82 0>; + status = "disabled"; + label = "UART_7"; + }; + + uart8: serial@40007c00 { + compatible = "st,stm32-uart"; + reg = <0x40007c00 0x400>; + interrupts = <83 0>; + status = "disabled"; + label = "UART_8"; + }; + + uart9: serial@40011800 { + compatible = "st,stm32-uart"; + reg = <0x40011800 0x400>; + interrupts = <88 0>; + status = "disabled"; + label = "UART_9"; + }; + + uart10: serial@40011c00 { + compatible = "st,stm32-uart"; + reg = <0x40011c00 0x400>; + interrupts = <89 0>; + status = "disabled"; + label = "UART_10"; + }; + }; +}; diff --git a/dts/arm/st/stm32f469.dtsi b/dts/arm/st/stm32f469.dtsi index c02702e5296..ddfbd6e4e8d 100644 --- a/dts/arm/st/stm32f469.dtsi +++ b/dts/arm/st/stm32f469.dtsi @@ -4,4 +4,24 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include + +/ { + soc { + uart7: serial@40007800 { + compatible = "st,stm32-uart"; + reg = <0x40007800 0x400>; + interrupts = <82 0>; + status = "disabled"; + label = "UART_7"; + }; + + uart8: serial@40007c00 { + compatible = "st,stm32-uart"; + reg = <0x40007c00 0x400>; + interrupts = <83 0>; + status = "disabled"; + label = "UART_8"; + }; + }; +};