[PATCH 0/6] More CCI mappings