I tried a similar version of this change and my eMAG reports CPU 0: APM eMAG 8180 r3p2 affinity: 0 0
I used 'ampere' in the struct name and comments though.
I think not reporting APM and Ampere improves consistency. So I changed that. However, I left the apm in the structure names since it corresponds with the APM in the constant for the implementer constant and the implementer name. However, I added a comment to provide a hint that these CPUs are now managed by Ampere Computing.