mvneta: fix merge problem.
dts: add armada-xp-mamba.dts