From 578a4795aba4e34b0c168e7e01cf4f537dba35c8 Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Fri, 4 Mar 2022 11:34:09 +0100 Subject: [PATCH] refactor(stm32mp1-fdts): remove nvmem_layout node Remove the nvmem_layout node with compatible "st,stm32-nvmem-layout" no more used in TF-A code to simplify the device tree. Signed-off-by: Patrick Delaunay Change-Id: I3748b20b7d3c60ee64ead15541fac1fd12656600 --- fdts/stm32mp131.dtsi | 20 -------------------- fdts/stm32mp135f-dk.dts | 22 ---------------------- fdts/stm32mp151.dtsi | 20 -------------------- fdts/stm32mp157c-ed1.dts | 20 -------------------- fdts/stm32mp15xx-dkx.dtsi | 20 -------------------- 5 files changed, 102 deletions(-) diff --git a/fdts/stm32mp131.dtsi b/fdts/stm32mp131.dtsi index dff1b33d8..adf7a91d6 100644 --- a/fdts/stm32mp131.dtsi +++ b/fdts/stm32mp131.dtsi @@ -26,26 +26,6 @@ }; }; - nvmem_layout: nvmem_layout@0 { - compatible = "st,stm32-nvmem-layout"; - - nvmem-cells = <&cfg0_otp>, - <&part_number_otp>, - <&monotonic_otp>, - <&nand_otp>, - <&nand2_otp>, - <&uid_otp>, - <&hw2_otp>; - - nvmem-cell-names = "cfg0_otp", - "part_number_otp", - "monotonic_otp", - "nand_otp", - "nand2_otp", - "uid_otp", - "hw2_otp"; - }; - clocks { clk_csi: clk-csi { #clock-cells = <0>; diff --git a/fdts/stm32mp135f-dk.dts b/fdts/stm32mp135f-dk.dts index 0fa064b7a..624038110 100644 --- a/fdts/stm32mp135f-dk.dts +++ b/fdts/stm32mp135f-dk.dts @@ -175,28 +175,6 @@ status = "okay"; }; -&nvmem_layout { - nvmem-cells = <&cfg0_otp>, - <&part_number_otp>, - <&monotonic_otp>, - <&nand_otp>, - <&nand2_otp>, - <&uid_otp>, - <&hw2_otp>, - <&pkh_otp>, - <&board_id>; - - nvmem-cell-names = "cfg0_otp", - "part_number_otp", - "monotonic_otp", - "nand_otp", - "nand2_otp", - "uid_otp", - "hw2_otp", - "pkh_otp", - "board_id"; -}; - &pka { secure-status = "okay"; }; diff --git a/fdts/stm32mp151.dtsi b/fdts/stm32mp151.dtsi index 454e12471..63cc917bc 100644 --- a/fdts/stm32mp151.dtsi +++ b/fdts/stm32mp151.dtsi @@ -24,26 +24,6 @@ }; }; - nvmem_layout: nvmem_layout@0 { - compatible = "st,stm32-nvmem-layout"; - - nvmem-cells = <&cfg0_otp>, - <&part_number_otp>, - <&monotonic_otp>, - <&nand_otp>, - <&uid_otp>, - <&package_otp>, - <&hw2_otp>; - - nvmem-cell-names = "cfg0_otp", - "part_number_otp", - "monotonic_otp", - "nand_otp", - "uid_otp", - "package_otp", - "hw2_otp"; - }; - psci { compatible = "arm,psci-1.0"; method = "smc"; diff --git a/fdts/stm32mp157c-ed1.dts b/fdts/stm32mp157c-ed1.dts index 44c701612..659e8bf85 100644 --- a/fdts/stm32mp157c-ed1.dts +++ b/fdts/stm32mp157c-ed1.dts @@ -195,26 +195,6 @@ status = "okay"; }; -&nvmem_layout { - nvmem-cells = <&cfg0_otp>, - <&part_number_otp>, - <&monotonic_otp>, - <&nand_otp>, - <&uid_otp>, - <&package_otp>, - <&hw2_otp>, - <&board_id>; - - nvmem-cell-names = "cfg0_otp", - "part_number_otp", - "monotonic_otp", - "nand_otp", - "uid_otp", - "package_otp", - "hw2_otp", - "board_id"; -}; - &pwr_regulators { vdd-supply = <&vdd>; vdd_3v3_usbfs-supply = <&vdd_usb>; diff --git a/fdts/stm32mp15xx-dkx.dtsi b/fdts/stm32mp15xx-dkx.dtsi index 2eb3a5796..05eb46a68 100644 --- a/fdts/stm32mp15xx-dkx.dtsi +++ b/fdts/stm32mp15xx-dkx.dtsi @@ -183,26 +183,6 @@ secure-status = "okay"; }; -&nvmem_layout { - nvmem-cells = <&cfg0_otp>, - <&part_number_otp>, - <&monotonic_otp>, - <&nand_otp>, - <&uid_otp>, - <&package_otp>, - <&hw2_otp>, - <&board_id>; - - nvmem-cell-names = "cfg0_otp", - "part_number_otp", - "monotonic_otp", - "nand_otp", - "uid_otp", - "package_otp", - "hw2_otp", - "board_id"; -}; - &pwr_regulators { vdd-supply = <&vdd>; vdd_3v3_usbfs-supply = <&vdd_usb>;