Skip to content

Commit c197179

Browse files
vai-tommemichalsimek
authored andcommitted
Revert "arm64: zynqmp: Add an OP-TEE node to the device tree"
This reverts commit 06d22ed. OP-TEE logic in U-Boot automatically injects a reserved-memory node along with optee firmware node to kernel device tree. The injection logic is dependent on that there is no manually defined optee node. Having the node in zynqmp.dtsi effectively breaks OP-TEE's insertion of the reserved-memory node, causing memory access violations during runtime. Signed-off-by: Tomas Melin <tomas.melin@vaisala.com> Signed-off-by: Michal Simek <michal.simek@amd.com> Link: https://lore.kernel.org/r/20251125-revert-zynqmp-optee-v1-1-d2ce4c0fcaf6@vaisala.com
1 parent 138cb5c commit c197179

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

arch/arm64/boot/dts/xilinx/zynqmp.dtsi

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,6 @@
192192
};
193193

194194
firmware {
195-
optee: optee {
196-
compatible = "linaro,optee-tz";
197-
method = "smc";
198-
};
199-
200195
zynqmp_firmware: zynqmp-firmware {
201196
compatible = "xlnx,zynqmp-firmware";
202197
#power-domain-cells = <1>;

0 commit comments

Comments
 (0)