Fix mismerge from the out of tree BSP where this support was developed.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>