[PATCH 00/25] More CCI mappings