No functional change in the code, just reorder the functions so
they are not in such a state of chaos.

Signed-off-by: Marek Vasut <marex@denx.de>