[GIT PULL v2] coresight: Fixes for v6.1