Hello,
I see that the changes made to ATF looks correct, even I would say that the changes made by @Chavira are mean to latest releases so if used in old releases some tunning may be needed.
I do not see the device tree changes, are those in place?
Best regards,
Aldo.