Rather than reading the cr_alignment variable, use get_cr() to read
directly from the hardware instead.  We have two places where this
occurs, neither of them are performance critical.
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>