Yes, use 12212156 for the new OS. Sounds like you might need to take the lid off and ground that pin on the board to recover your PCM. I've never seen an XDF for 12216125.

Rick