[PATCH 0/5] More CCI mappings