The board mainboards/sunxi/nezha is currently based on a fork where I shoved in some extras on top of smaeul's mainline patches, which will land in upstream at some point:
https://lore.kernel.org/lkml/[email protected]/

When merged, we can switch to upstream, maybe 6.0.