There is nothing special about having the init code separate from
the common code, so combine the two.
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>