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 <erwan.gouriou@linaro.org>
This commit is contained in:
Erwan Gouriou 2017-05-18 16:55:23 +02:00 committed by Anas Nashif
commit 607fd149ec
5 changed files with 112 additions and 60 deletions

View file

@ -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";
};
};
};

View file

@ -4,4 +4,32 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <st/stm32f4.dtsi>
#include <st/stm32f411.dtsi>
/ {
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";
};
};
};

View file

@ -4,4 +4,4 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <st/stm32f4.dtsi>
#include <st/stm32f401.dtsi>

View file

@ -4,4 +4,64 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <st/stm32f4.dtsi>
#include <st/stm32f411.dtsi>
/ {
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";
};
};
};

View file

@ -4,4 +4,24 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <st/stm32f4.dtsi>
#include <st/stm32f407.dtsi>
/ {
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";
};
};
};