adm5120: include r21398 actual changes