FYI, I have rebased linaro-swg/linux branch optee onto Linux kernel v5.13. The previous tip of the branch is saved as tag optee-v5.12-20210628. The only remaining differences between our branch and upstream are:

1. The "benchmark" support code,
2. DTS updates.