From 4c07deb53e0e7daafc93bc67fdcbb3de7b73d730 Mon Sep 17 00:00:00 2001 From: Yann Gautier Date: Mon, 2 May 2022 11:12:43 +0200 Subject: [PATCH] fix(stm32mp13-fdts): cleanup DT files Instead of adding all peripheral nodes in SoC DT files, and then removing them with BL2 overlay file, just remove them from SoC files. And remove peripherals that are not used in TF-A on STM32MP13. Signed-off-by: Yann Gautier Change-Id: I0c408d29b55cb94644c92539460fc62485781223 --- fdts/stm32mp13-bl2.dtsi | 68 ----------------------------------------- fdts/stm32mp131.dtsi | 20 ------------ fdts/stm32mp133.dtsi | 14 --------- fdts/stm32mp135.dtsi | 5 --- fdts/stm32mp13xc.dtsi | 9 ------ fdts/stm32mp13xf.dtsi | 9 ------ 6 files changed, 125 deletions(-) diff --git a/fdts/stm32mp13-bl2.dtsi b/fdts/stm32mp13-bl2.dtsi index 00bf1b552..4e3701c85 100644 --- a/fdts/stm32mp13-bl2.dtsi +++ b/fdts/stm32mp13-bl2.dtsi @@ -9,70 +9,12 @@ /delete-property/ mmc0; /delete-property/ mmc1; #endif - /delete-property/ ethernet0; - /delete-property/ ethernet1; }; - cpus { - cpu@0 { - /delete-property/ operating-points-v2; - }; - }; - - /delete-node/ cpu0-opp-table; - /delete-node/ psci; - soc { - /delete-node/ sram@30000000; - /delete-node/ timer@40000000; - /delete-node/ timer@40001000; - /delete-node/ timer@40002000; - /delete-node/ timer@40003000; - /delete-node/ timer@40004000; - /delete-node/ timer@40005000; - /delete-node/ timer@40009000; - /delete-node/ spi@4000b000; - /delete-node/ audio-controller@4000b000; - /delete-node/ spi@4000c000; - /delete-node/ audio-controller@4000c000; - /delete-node/ audio-controller@4000d000; - /delete-node/ i2c@40012000; - /delete-node/ i2c@40013000; - /delete-node/ timer@44000000; - /delete-node/ timer@44001000; - /delete-node/ spi@44004000; - /delete-node/ audio-controller@44004000; - /delete-node/ sai@4400a000; - /delete-node/ sai@4400b000; - /delete-node/ dfsdm@4400d000; - /delete-node/ can@4400e000; - /delete-node/ can@4400f000; - /delete-node/ dma-controller@48000000; - /delete-node/ dma-controller@48001000; - /delete-node/ dma-router@48002000; - /delete-node/ adc@48003000; - /delete-node/ adc@48004000; - /delete-node/ dma@48005000; - /delete-node/ dma-router@48006000; #if !STM32MP_USB_PROGRAMMER /delete-node/ usb-otg@49000000; #endif - /delete-node/ spi@4c002000; - /delete-node/ spi@4c003000; - /delete-node/ timer@4c007000; - /delete-node/ timer@4c008000; - /delete-node/ timer@4c009000; - /delete-node/ timer@4c00a000; - /delete-node/ timer@4c00b000; - /delete-node/ timer@4c00c000; - /delete-node/ timer@50021000; - /delete-node/ timer@50022000; - /delete-node/ timer@50023000; - /delete-node/ timer@50024000; - /delete-node/ vrefbuf@50025000; - /delete-node/ thermal@50028000; - /delete-node/ hdp@5002a000; - /delete-node/ dma-controller@58000000; #if !STM32MP_RAW_NAND /delete-node/ memory-controller@58002000; #endif @@ -83,23 +25,13 @@ /delete-node/ mmc@58005000; /delete-node/ mmc@58007000; #endif - /delete-node/ crc@58009000; - /delete-node/ stmmac-axi-config; - /delete-node/ eth1@5800a000; #if !STM32MP_USB_PROGRAMMER /delete-node/ usbh-ohci@5800c000; /delete-node/ usbh-ehci@5800d000; #endif - /delete-node/ eth2@5800e000; - /delete-node/ dcmipp@5a000000; - /delete-node/ display-controller@5a001000; #if !STM32MP_USB_PROGRAMMER /delete-node/ usbphyc@5a006000; #endif - /delete-node/ perf@5a007000; - /delete-node/ rtc@5c004000; - /delete-node/ tamp@5c00a000; - /delete-node/ stgen@5c008000; pinctrl@50002000 { #if !STM32MP_EMMC && !STM32MP_SDMMC diff --git a/fdts/stm32mp131.dtsi b/fdts/stm32mp131.dtsi index 712ac201c..2c6240851 100644 --- a/fdts/stm32mp131.dtsi +++ b/fdts/stm32mp131.dtsi @@ -259,15 +259,6 @@ clocks = <&rcc SYSCFG>; }; - vrefbuf: vrefbuf@50025000 { - compatible = "st,stm32-vrefbuf"; - reg = <0x50025000 0x8>; - regulator-min-microvolt = <1500000>; - regulator-max-microvolt = <2500000>; - clocks = <&rcc VREF>; - status = "disabled"; - }; - hash: hash@54003000 { compatible = "st,stm32mp13-hash"; reg = <0x54003000 0x400>; @@ -350,12 +341,6 @@ status = "disabled"; }; - crc1: crc@58009000 { - compatible = "st,stm32f7-crc"; - reg = <0x58009000 0x400>; - clocks = <&rcc CRC1>; - }; - usbh_ohci: usbh-ohci@5800c000 { compatible = "generic-ohci"; reg = <0x5800c000 0x1000>; @@ -471,11 +456,6 @@ st,non-secure-otp; }; }; - - tamp: tamp@5c00a000 { - reg = <0x5c00a000 0x400>; - }; - /* * Break node order to solve dependency probe issue between * pinctrl and exti. diff --git a/fdts/stm32mp133.dtsi b/fdts/stm32mp133.dtsi index 8bbcc6154..bb468c024 100644 --- a/fdts/stm32mp133.dtsi +++ b/fdts/stm32mp133.dtsi @@ -5,17 +5,3 @@ */ #include "stm32mp131.dtsi" - -/ { - soc { - m_can1: can@4400e000 { - reg = <0x4400e000 0x400>, <0x44011000 0x1400>; - status = "disabled"; - }; - - m_can2: can@4400f000 { - reg = <0x4400f000 0x400>, <0x44011000 0x2800>; - status = "disabled"; - }; - }; -}; diff --git a/fdts/stm32mp135.dtsi b/fdts/stm32mp135.dtsi index 415bb9b59..b5ebdd9bf 100644 --- a/fdts/stm32mp135.dtsi +++ b/fdts/stm32mp135.dtsi @@ -5,8 +5,3 @@ */ #include "stm32mp133.dtsi" - -/ { - soc { - }; -}; diff --git a/fdts/stm32mp13xc.dtsi b/fdts/stm32mp13xc.dtsi index c03bd43a3..4b30c5c32 100644 --- a/fdts/stm32mp13xc.dtsi +++ b/fdts/stm32mp13xc.dtsi @@ -8,15 +8,6 @@ / { soc { - cryp: crypto@54002000 { - compatible = "st,stm32mp1-cryp"; - reg = <0x54002000 0x400>; - interrupts = ; - clocks = <&rcc CRYP1>; - resets = <&rcc CRYP1_R>; - status = "disabled"; - }; - saes: saes@54005000 { compatible = "st,stm32-saes"; reg = <0x54005000 0x400>; diff --git a/fdts/stm32mp13xf.dtsi b/fdts/stm32mp13xf.dtsi index e467d71af..887c4e006 100644 --- a/fdts/stm32mp13xf.dtsi +++ b/fdts/stm32mp13xf.dtsi @@ -7,15 +7,6 @@ / { soc { - cryp: crypto@54002000 { - compatible = "st,stm32mp1-cryp"; - reg = <0x54002000 0x400>; - interrupts = ; - clocks = <&rcc CRYP1>; - resets = <&rcc CRYP1_R>; - status = "disabled"; - }; - saes: saes@54005000 { compatible = "st,stm32-saes"; reg = <0x54005000 0x400>;