SAMA5 UPPHS: Fix a small mountain of compilation errors.  Still things to REVISIT so it is not ready for test