[ARM] Orion: rework MPP handling