diff options
| author | Tom Rini <trini@konsulko.com> | 2023-08-25 10:52:13 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-25 10:52:13 -0400 |
| commit | 6b7aff36284c560de87801d2ec3ba0c554dbb96d (patch) | |
| tree | a0d4285b9f1415904dcb30846e91d07bb51a7933 | |
| parent | 291055efee4e1ae4ad0b62393256514a4e76cb1e (diff) | |
| parent | 3fce6bf213095121411fd8d8eb116a8cb1784141 (diff) | |
| download | u-boot-6b7aff36284c560de87801d2ec3ba0c554dbb96d.zip u-boot-6b7aff36284c560de87801d2ec3ba0c554dbb96d.tar.gz u-boot-6b7aff36284c560de87801d2ec3ba0c554dbb96d.tar.bz2 | |
Merge tag 'u-boot-stm32-20230825' of https://source.denx.de/u-boot/custodians/u-boot-stm
Remove scmi-optee shmem for STM32MP15 and STM32MP13
| -rw-r--r-- | arch/arm/dts/stm32mp13-u-boot.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/dts/stm32mp131.dtsi | 14 | ||||
| -rw-r--r-- | arch/arm/dts/stm32mp15-scmi.dtsi | 16 |
3 files changed, 0 insertions, 38 deletions
diff --git a/arch/arm/dts/stm32mp13-u-boot.dtsi b/arch/arm/dts/stm32mp13-u-boot.dtsi index 726cd1a..aa5cfc6 100644 --- a/arch/arm/dts/stm32mp13-u-boot.dtsi +++ b/arch/arm/dts/stm32mp13-u-boot.dtsi @@ -108,14 +108,6 @@ bootph-all; }; -&scmi_shm { - bootph-all; -}; - -&scmi_sram { - bootph-all; -}; - &syscfg { bootph-all; }; diff --git a/arch/arm/dts/stm32mp131.dtsi b/arch/arm/dts/stm32mp131.dtsi index d163c26..d23bbc3 100644 --- a/arch/arm/dts/stm32mp131.dtsi +++ b/arch/arm/dts/stm32mp131.dtsi @@ -40,7 +40,6 @@ #address-cells = <1>; #size-cells = <0>; linaro,optee-channel-id = <0>; - shmem = <&scmi_shm>; scmi_clk: protocol@14 { reg = <0x14>; @@ -106,19 +105,6 @@ interrupt-parent = <&intc>; ranges; - scmi_sram: sram@2ffff000 { - compatible = "mmio-sram"; - reg = <0x2ffff000 0x1000>; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0 0x2ffff000 0x1000>; - - scmi_shm: scmi-sram@0 { - compatible = "arm,scmi-shmem"; - reg = <0 0x80>; - }; - }; - timers2: timer@40000000 { #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/dts/stm32mp15-scmi.dtsi b/arch/arm/dts/stm32mp15-scmi.dtsi index 543f24c..ad25842 100644 --- a/arch/arm/dts/stm32mp15-scmi.dtsi +++ b/arch/arm/dts/stm32mp15-scmi.dtsi @@ -16,7 +16,6 @@ #address-cells = <1>; #size-cells = <0>; linaro,optee-channel-id = <0>; - shmem = <&scmi_shm>; scmi_clk: protocol@14 { reg = <0x14>; @@ -60,21 +59,6 @@ }; }; }; - - soc { - scmi_sram: sram@2ffff000 { - compatible = "mmio-sram"; - reg = <0x2ffff000 0x1000>; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0 0x2ffff000 0x1000>; - - scmi_shm: scmi-sram@0 { - compatible = "arm,scmi-shmem"; - reg = <0 0x80>; - }; - }; - }; }; ®11 { |